Merge branch 'hotfix-1.3' of https://github.com/Pr0curo/nana into Pr0curo-hotfix-1.3

This commit is contained in:
Jinhao
2016-03-23 16:21:26 +08:00
5 changed files with 14 additions and 4 deletions

View File

@@ -13,8 +13,9 @@
#include <nana/gui/wvl.hpp>
#include <nana/gui/detail/bedrock.hpp>
#include <thread>
#include <nana/std_thread.hpp>
#include <iostream>
#include <chrono>
//#define NANA_AUTOMATIC_GUI_TESTING
namespace nana