Merge branch 'hotfix-1.3' into develop

2016-06-24 03:06:23 +08:00
parent f093f14c37 5301b31ae2
commit 12678e47c5
9 changed files with 286 additions and 132 deletions
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -701,3 +701,6 @@ namespace nana

 }

+#if defined(VERBOSE_PREPROCESSOR)
+#	include <nana/verbose_preprocessor.hpp>
+#endif