From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq

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

diff --git a/.gitignore b/.gitignore
index bbc64e0..662f3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,14 @@
 QiaoJiaSystem/build/\.fuse_hidden00020f790000007d
 
 QiaoJiaSystem/build/\.fuse_hidden000210720000007e
+
+\.idea/
+
+QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/
+
+QiaoJiaSystem/DataManagerServer/cmake-build-debug/
+
+QiaoJiaSystem/build/\.fuse_hidden*
+
+
+QiaoJiaSystem/enctest/cmake-build-debug/

--
Gitblit v1.8.0