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

..

linux_X11

Merge branch 'hotfixes' into develop

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

win32

Renamed expr_color to color

2014-12-24 02:07:39 +08:00

platform_spec_selector.cpp

A fix for non-English input issue.

2014-12-23 17:09:30 +08:00