summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorxyverz2016-11-16 22:36:36 -0800
committerxyverz2016-11-16 22:36:36 -0800
commitb493f6a4ed14e74c268ae3d7a07577591fe71cc7 (patch)
tree0da986aa45733b08c6b8c379658abd5e0a1fb8a7 /.gitignore
parent8dd422ffe1a84416dd4a8d38878979f5b7bbd51b (diff)
parentc38b3e3be93a8b4f520212117b6498a288d67751 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 153fea093..f66a961fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ CMakeLists.txt
.browse.VC.db*
*.stackdump
util/Win_Check_Output.txt
+.vscode
+.stfolder