From 2f6e3d281857de94a23fa79823166d57196f6181 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 16 5月 2020 21:54:27 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop

---
 .gitignore |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 469799c..6728aa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 #Visual studio files
 .vs
+/out
 
 # Compiled Static libraries
 *.lai
@@ -20,6 +21,7 @@
 # Cmake generated files
 build/*
 !build/.gitkeep 
+install/*
 
 #eclipse files
 .cproject
@@ -28,6 +30,9 @@
 *.out
 /Default/
 
-product/*
-!product/.gitkeep
+projects/*
+!projects/.gitkeep
 
+**/CMakeCache.txt
+**/CMakeFiles
+/CMakeSettings.json

--
Gitblit v1.9.1