From faf607903da202a60438c1b50e569996fe301543 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7165b6c..2d30086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 #Visual studio files
 .vs
+/out
 
 # Compiled Static libraries
 *.lai
@@ -18,7 +19,8 @@
 /Testing
 
 # Cmake generated files
-build
+build/*
+!build/.gitkeep 
 
 #eclipse files
 .cproject
@@ -26,3 +28,10 @@
 .project
 *.out
 /Default/
+
+projects/*
+!projects/.gitkeep
+
+**/CMakeCache.txt
+**/CMakeFiles
+/CMakeSettings.json

--
Gitblit v1.9.1