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

2016-08-23 07:52:28 +08:00
parent ea102d8886 5f0b774305
commit c3fb1f774a
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ CMakeFiles/
 cmake_install.cmake
 *.DS_Store

+*.db
+*.opendb