Merge remote-tracking branch 'origin/master' into debugger/shadow/atelier
[xonotic/xonotic-maps.pk3dir.git] / .gitignore
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into debug...
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2014-11-27 MarioMerge branch 'nyov/instagib-rename'
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2014-11-18 MirioMerge branch 'master' into mirio/implosion
2014-11-16 MarioMerge branch 'master' into Mario/monsters 2/head
2014-11-13 MarioMerge branch 'Mirio/map_updates'
2014-11-13 MarioIgnore Mac OS X .DS_Store files
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