Merge branch 'master' into Mirio/implosion

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

diff --git a/.gitignore b/.gitignore
index 4190d18856e7b644511ec0d2ee77f0e4db981336..9b3a43bef9baedfce1268a4b56bc4e2ceb88d673 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maps/*.bsp
 maps/*/lm_*.tga
 maps/*.bsp
 maps/*/lm_*.tga

+.DS_Store