Jinhao 08e860a7e7 Merge branch 'hotfixes-1.0.1' into develop
Conflicts:
	.gitignore
	include/nana/deploy.hpp
	source/deploy.cpp
	source/gui/widgets/listbox.cpp
2015-05-03 03:08:26 +08:00
..
2015-04-21 22:33:18 +08:00
2015-02-04 10:26:08 +08:00