From 0ec4d68600b83d41d2e48ad35d18e2a00f234619 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop

---
 .gitignore |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index d97328f..6cd6db1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,13 @@
 *.la
 *.a
 /Makefile
+/Testing
+
+# Cmake generated files
+build
+
+#eclipse files
+.cproject
+.settings
+.project
+*.out
\ No newline at end of file

--
Gitblit v1.9.1