From bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 14:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

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

diff --git a/.gitignore b/.gitignore
index 6435583..d757c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,29 @@
 
 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