From a2da7ee9b5198a24657947b086c7531312833be8 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:13: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 0018bea..2d30086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,10 @@
 *.so
 *.dylib
 
+#Visual studio files
+.vs
+/out
+
 # Compiled Static libraries
 *.lai
 *.la
@@ -15,7 +19,8 @@
 /Testing
 
 # Cmake generated files
-build
+build/*
+!build/.gitkeep 
 
 #eclipse files
 .cproject
@@ -23,3 +28,10 @@
 .project
 *.out
 /Default/
+
+projects/*
+!projects/.gitkeep
+
+**/CMakeCache.txt
+**/CMakeFiles
+/CMakeSettings.json

--
Gitblit v1.9.1