diff options
author | xyverz <xyverz@gmail.com> | 2016-11-16 22:36:36 -0800 |
---|---|---|
committer | xyverz <xyverz@gmail.com> | 2016-11-16 22:36:36 -0800 |
commit | b493f6a4ed14e74c268ae3d7a07577591fe71cc7 (patch) | |
tree | 0da986aa45733b08c6b8c379658abd5e0a1fb8a7 /.gitignore | |
parent | 8dd422ffe1a84416dd4a8d38878979f5b7bbd51b (diff) | |
parent | c38b3e3be93a8b4f520212117b6498a288d67751 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 153fea093c..f66a961fd1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ CMakeLists.txt .browse.VC.db* *.stackdump util/Win_Check_Output.txt +.vscode +.stfolder |