Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 .gitignore

@@ -19,3 +19,15 @@
*.exe
*.out
*.app

QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/

*.cmake

build-QiaoJiaSystem-unknown-Default/

QiaoJiaSystem/build/glog_dump\.log

QiaoJiaSystem/CMakeLists\.txt\.user