From 84597288d950867922a185b2c5a8231495a5d303 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers

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

diff --git a/.gitignore b/.gitignore
index 7165b6c..8b11b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,8 @@
 /Testing
 
 # Cmake generated files
-build
+build/*
+!build/.gitkeep 
 
 #eclipse files
 .cproject
@@ -26,3 +27,9 @@
 .project
 *.out
 /Default/
+
+projects/*
+!projects/.gitkeep
+
+**/CMakeCache.txt
+**/CMakeFiles

--
Gitblit v1.9.1