cnjinhao 04afbe9df9 Merge branch 'hotfixes-0.9.1' into develop ...

Conflicts:
	include/nana/gui/widgets/progress.hpp
	source/gui/widgets/date_chooser.cpp
	source/gui/widgets/progress.cpp
	source/gui/widgets/treebox.cpp

2015-02-02 18:55:23 +08:00

..

text_editor.cpp

Merge branch 'hotfixes-0.9.1' into develop

2015-02-02 18:55:23 +08:00