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

..

platform_spec.cpp

Merge branch 'hotfixes' into develop

2015-01-02 23:54:55 +08:00