Merge remote branch 'origin/master' into m0rfar/heaven
[xonotic/xonotic-maps.pk3dir.git] / .gitignore
2010-06-18 Rudolf PolzerMerge remote branch 'origin/morphed/mapstuff'
2010-06-17 Rudolf Polzerdo not track compiled BSPs of maps