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

..

nana

Merge branch 'hotfixes-1.0.1' into develop

2015-05-03 03:08:26 +08:00