Merge branch 'develop_1' of https://github.com/dankan1890/nana into dankan1890-develop_1

This commit is contained in:
Jinhao 2016-08-23 07:52:28 +08:00
commit c3fb1f774a

2
.gitignore vendored
View File

@ -43,3 +43,5 @@ CMakeFiles/
cmake_install.cmake
*.DS_Store
*.db
*.opendb