From 7734dad8901d8ee40f5a7ba5d04800ca41540dab Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:39:06 +0800
Subject: [PATCH] Merge branch 'feature_uploadPersonCutImage' into ywv1.2

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

diff --git a/.gitignore b/.gitignore
index 22d3786..bbc64e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,17 @@
 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

--
Gitblit v1.8.0