From 4001288af80a5e07bb96dd2a7d41d7cb0052a560 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 26 十二月 2018 14:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature_addPersonTracking' into feature_addPersonTracking

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

diff --git a/.gitignore b/.gitignore
index 0def275..0aa5b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,13 @@
 *.exe
 *.out
 *.app
+
+\.idea/
+
+syncDBTool/cmake-build-debug/
+
+QiaoJiaSystem/cmake-build-debug/
+
+QiaoJiaSystem/YoloServer/cmake-build-debug/
+
+syncDBTool/\.fuse_hidden00038cb8000000da

--
Gitblit v1.8.0