Merge branch 'master' into Mirio/implosion
[xonotic/xonotic-maps.pk3dir.git] / .gitignore
index 4190d18..9b3a43b 100644 (file)
@@ -1,2 +1,3 @@
 maps/*.bsp
 maps/*/lm_*.tga
+.DS_Store