Merge branch 'master' into terencehill/music_player

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

diff --git a/.gitignore b/.gitignore
index a305108b3a2a7b85823098b7c60d5cf480f50003..6b5cef68e6ae6881cd0fc23abc2340230d73614e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ weapons.qc.tmp
 *.lno
 qcsrc/qccversion*
 qcsrc/server/precache-for-csqc.inc
+.DS_Store