From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3

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

diff --git a/.gitignore b/.gitignore
index bbc64e0..d757c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,12 @@
 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