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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 469799c..2d30086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 #Visual studio files
 .vs
+/out
 
 # Compiled Static libraries
 *.lai
@@ -28,6 +29,9 @@
 *.out
 /Default/
 
-product/*
-!product/.gitkeep
+projects/*
+!projects/.gitkeep
 
+**/CMakeCache.txt
+**/CMakeFiles
+/CMakeSettings.json

--
Gitblit v1.9.1