From debbd7291500b19f48ec48cbbb6180e298a70470 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周一, 04 5月 2020 21:28:51 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop

---
 .gitignore |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

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

--
Gitblit v1.9.1