Merge remote-tracking branch 'origin/Mirio/darkzone'
[xonotic/xonotic-maps.pk3dir.git] / .gitignore
2010-07-24 FruitieXMerge branch 'fruitiex/runningmanctf' of ssh://git...
2010-07-21 Rudolf PolzerMerge branch 'origin/master' (early part) into fruitiex...
2010-07-21 Rudolf PolzerMerge branch 'origin/master' (early part) into fruitiex...
2010-06-18 Rudolf PolzerMerge remote branch 'origin/morphed/mapstuff'
2010-06-17 Rudolf Polzerdo not track compiled BSPs of maps