From 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 18:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

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

diff --git a/.gitignore b/.gitignore
index 0def275..cc7ee11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,15 @@
 *.exe
 *.out
 *.app
+
+QiaoJiaSystem/\.idea/
+
+QiaoJiaSystem/cmake-build-debug/
+
+*.cmake
+
+build-QiaoJiaSystem-unknown-Default/
+
+QiaoJiaSystem/build/glog_dump\.log
+
+QiaoJiaSystem/CMakeLists\.txt\.user

--
Gitblit v1.8.0