From fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:28:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

---
 .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