Merge branch 'hotfix-1.3' into develop

2016-06-10 17:08:48 +08:00
parent 5fdaeb6f45 a591735a2a
commit 2f9056cc7a
14 changed files with 294 additions and 214 deletions
--- a/source/gui/detail/bedrock_windows.cpp
+++ b/source/gui/detail/bedrock_windows.cpp
@@ -26,8 +26,6 @@
 #include <nana/gui/detail/element_store.hpp>
 #include <nana/gui/detail/color_schemes.hpp>

-#include <iostream>
-
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL	0x020A
 #endif