From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug

---
 .gitignore |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0def275..d757c14 100644
--- a/.gitignore
+++ b/.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*
+

--
Gitblit v1.8.0