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-03-25 01:56:48 +08:00
2015-02-26 02:35:19 +08:00
2015-04-21 22:33:18 +08:00
2014-12-28 17:16:52 +08:00
2014-12-11 03:32:35 +08:00
2015-04-21 22:33:18 +08:00
2015-05-01 16:45:05 +08:00
2015-05-02 02:25:04 +08:00
2014-12-17 11:20:47 +08:00
2015-02-16 06:59:56 +08:00
2015-04-26 00:50:28 +08:00
2015-02-25 17:18:13 +08:00
2015-02-04 10:26:08 +08:00
2015-02-04 10:26:08 +08:00