Merge branch 'hotfix-1.2' into prepare-utf8

2015-12-04 23:44:11 +08:00
parent e8266b5ae8 21a5e2fc2e
commit babcacd63d
28 changed files with 351 additions and 236 deletions
--- a/source/detail/linux_X11/platform_spec.cpp
+++ b/source/detail/linux_X11/platform_spec.cpp
@@ -13,6 +13,7 @@
 *
 *	http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt
 */
+
 #include <nana/detail/platform_spec_selector.hpp>
 #include <X11/Xlocale.h>
 #include <locale>
--- a/source/detail/win32/platform_spec.cpp
+++ b/source/detail/win32/platform_spec.cpp
@@ -11,6 +11,7 @@
 *
 *	This file provides basis class and data structrue that required by nana
 */
+
 #include <nana/detail/platform_spec_selector.hpp>
 #include <shellapi.h>
 #include <stdexcept>