From 19ee9f50a7d14f48ca993b7c8b21ef4ca3642809 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 10:25:45 +0800
Subject: [PATCH] Merge branch 'feature/vs2019_github_actions' of https://github.com/open-license-manager/open-license-manager into feature/vs2019_github_actions

---
 .gitignore |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

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

--
Gitblit v1.9.1