From 16b03534075d4fdbe2ec9cf3860874d91f24c01b Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 19:23:41 +0800
Subject: [PATCH] Merge branch 'Develop' into feature_uploadPersonCutImage

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

diff --git a/.gitignore b/.gitignore
index 6dde67c..1fd9bcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,17 @@
 QiaoJiaSystem/\.idea/
 
 QiaoJiaSystem/cmake-build-debug/
+
+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

--
Gitblit v1.8.0