cnjinhao 4bc00f3517 Merge branch 'hotfixes' into develop
Conflicts:
	include/nana/detail/linux_X11/platform_spec.hpp
	source/detail/linux_X11/platform_spec.cpp
	source/paint/detail/native_paint_interface.cpp
2015-01-02 23:54:55 +08:00
..
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2015-01-02 23:54:55 +08:00
2014-12-28 17:16:52 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2014-12-13 01:01:13 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00
2014-12-11 03:32:35 +08:00