Merge branch 'Mario/monsters' into 'develop'

[xonotic/xonotic-data.pk3dir.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 77433f6374c29c4437223195b77f85bda33a2146..cfb3f6fcb5945323788e0223f631b80fbc7c6947 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-csprogs.dat
-menu.dat
-progs.dat
-qcsrc/client/fteqcc.log
-qcsrc/menu/fteqcc.log
-qcsrc/server/fteqcc.log
-weapons.qc.tmp
+/*.dat
+/*.lno
+
+cscope*
+.DS_Store
+.idea/
+Thumbs.db