Ignore VI swap files and GIT merge files

This commit is contained in:
Jake Turner
2017-01-01 19:54:16 +00:00
committed by Baldur Karlsson
parent ee981ac59c
commit 240795ab70
+2
View File
@@ -31,6 +31,8 @@ obj/
*.sdf
*.suo
*.dll
*.swp
*.orig
symsrv.yes
ipch/
renderdoc/driver/vulkan/renderdoc_capture.json