Merge branch 'master' into maddin/shader-weapclip
[xonotic/xonotic-maps.pk3dir.git] / .gitignore
1 maps/*.bsp
2 maps/*/lm_*.tga
3 .DS_Store