Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

chenshijun

2019-03-15 25f94726888e19d6efed7b393217d9f56a0ca767

 .gitignore

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

QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/

*.cmake

build-QiaoJiaSystem-unknown-Default/

QiaoJiaSystem/build/glog_dump\.log

QiaoJiaSystem/CMakeLists\.txt\.user

\.idea/

QiaoJiaSystem/build/\.fuse_hidden0001973000000002

QiaoJiaSystem/DataManagerServer/cmake-build-debug/

QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/

QiaoJiaSystem/build/glog_dump\.log
*/cmake-build-debug/
\.idea/

QiaoJiaSystem/build/\.fuse_hidden00020f790000007d

QiaoJiaSystem/build/\.fuse_hidden000210720000007e

\.idea/

QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/

QiaoJiaSystem/DataManagerServer/cmake-build-debug/

QiaoJiaSystem/build/\.fuse_hidden*