Commit Graph

6 Commits

Author SHA1 Message Date
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
qqiangwu
9c3f53eab8 modify readme and fix(maybe?) the curious thread support problem 2015-04-12 00:59:49 +08:00
qqiangwu
86d675fa85 fix mingw compilation error 2015-04-05 22:07:57 +08:00
qPCR4vir
3b2e63da67 ignore lib/ 2015-03-04 03:30:54 +01:00
qPCR4vir
f25fcade08 ignore *.a 2015-02-27 19:50:25 +01:00
cnjinhao
b72c549dbc Adding .gitignore file
This file was created by qPCR4vir.
2014-12-13 01:38:48 +08:00