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 |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 33cf0b9..8b11b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@
 *.so
 *.dylib
 
+#Visual studio files
+.vs
+
 # Compiled Static libraries
 *.lai
 *.la
@@ -15,9 +18,18 @@
 /Testing
 
 # Cmake generated files
-build
+build/*
+!build/.gitkeep 
 
 #eclipse files
 .cproject
 .settings
 .project
+*.out
+/Default/
+
+projects/*
+!projects/.gitkeep
+
+**/CMakeCache.txt
+**/CMakeFiles

--
Gitblit v1.9.1