From 2695752f624aa7dc3f91672c6fbeb894c22eaa47 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers

---
 .gitignore |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4c435e..8b11b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@
 *.so
 *.dylib
 
+#Visual studio files
+.vs
+
 # Compiled Static libraries
 *.lai
 *.la
@@ -15,5 +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