Jinhao 7d868f2377 Merge branch 'develop' of https://github.com/beru/nana into beru-develop
Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp
2015-08-01 22:08:06 +08:00
..
2015-07-22 01:17:02 +08:00
2015-07-24 00:44:35 +08:00
2015-08-01 21:45:22 +08:00
2015-07-24 00:44:35 +08:00
2014-12-11 03:32:35 +08:00
2015-07-24 00:44:35 +08:00
2015-07-24 00:44:35 +08:00
2015-07-24 00:44:35 +08:00
2015-08-01 21:45:22 +08:00
2015-08-01 21:45:22 +08:00