Resolved .gitignore conflict

[xonotic/darkplaces.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7d90b57aaf776f5372a2d4f14dea6e33050f771e..5ba9ca0f22b30415bea8d957208fbf017f9c81c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,7 @@ Makefile.win
 /build
 /.cache
 *.kdev4
+*.vcxproj.user
+*.pdb
+*.lib
+*.exp