Resolved .gitignore conflict

[xonotic/darkplaces.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a6084b0d49f94ad453667bb03e41c8e0cd6afdbe..5ba9ca0f22b30415bea8d957208fbf017f9c81c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ Makefile.win
 .ccls-cache
 *.gch
 /.vs
+/build
+/.cache
+*.kdev4
 *.vcxproj.user
 *.pdb
 *.lib