Merge branch 'hotfix-1.4.1' into develop

2017-03-24 06:04:11 +08:00
parent f983e4a610 b1fe1ca412
commit c233708841
6 changed files with 434 additions and 445 deletions
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -23,7 +23,6 @@
        #include <mutex>
 	#endif
 	#include <map>
-	#include "../../paint/detail/image_ico.hpp"
 #elif defined(NANA_X11)
 	#include <nana/system/platform.hpp>
 #endif