From 8bfe9f711612efde96a0d7b7aa3ba7178ab51640 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:10:11 +0800
Subject: [PATCH] Merge branch 'master' into dev

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

diff --git a/.gitignore b/.gitignore
index 31c642f..4064938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,13 @@
 *.app
 *.tar
 *.tar.gz
+*.d
 .vscode/
+.idea/
+
+build/
+dest/
+cmake-build-debug/
+*.tmp
+core
+tags

--
Gitblit v1.8.0