Merge branch 'Mario/monsters' into 'develop'

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

diff --git a/.gitignore b/.gitignore
index f4611af9310bd9c5c7ab12a06bf04387fd72d086..cfb3f6fcb5945323788e0223f631b80fbc7c6947 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 /*.dat
 /*.lno
 
+cscope*
 .DS_Store
 .idea/
+Thumbs.db