]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/history - maps/drain.mapinfo
merge conflict
[xonotic/xonotic-maps.pk3dir.git] / maps / drain.mapinfo
2015-07-11 MarioAdd drain back in, oops
2015-07-11 MarioMerge branch 'master' into debugger/shadow/atelier
2015-07-11 MarioMerge branch 'Mario/map_nukes'
2015-07-11 MarioRemove all known files related to drain, newtonian...
2015-03-16 MirioMerge branch 'master' into amade/finalrage
2015-03-06 MirioMerge branch 'master' into debugger/shadow/atelier
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-11 MirioMerge branch 'master' into maddin/map-warfare
2015-02-11 Miriomapinfo
2015-02-09 MirioMerge branch 'master' into mirio/mapfixes
2015-02-09 MirioMerge branch 'Mirio/mapinfos'
2015-02-08 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-01-24 MirioUpdate mapinfos with new cvars names and cdtracks
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into debug...
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into maddi...
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2014-11-27 MarioMerge branch 'master' into mirceakitsune/world_cubemaps
2014-11-16 MarioMerge branch 'master' into Mario/monsters 2/head
2014-06-17 MirioMerge branch 'master' of git://de.git.xonotic.org/xonot...
2013-11-24 Samual LenksMerge remote-tracking branch 'origin/Mario/arena_nuke'
2013-11-24 MarioRemove arena from mapinfos
2013-08-14 Rudolf PolzerMerge remote-tracking branch 'origin/debugger/exomorphx...
2013-06-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/glowplant'
2013-05-31 Samual LenksMerge remote-tracking branch 'origin/debugger/dance'
2013-05-15 MarioMerge branch 'master' into Mario/monsters
2013-05-14 kuniuthefroggMerge branch 'master' into kuniuthefrogg/silentsiege
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/fruitiex/runningma...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/solarium'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/Mirio/space-elevator'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/master' into debug...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/oilrig'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-04-22 kuniuthefroggnew mappic, updated mapinfo, final polishing of item...
2012-08-28 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-04-04 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
2012-02-11 cbrutailMerge branch 'master' into cbrutail/darkzone
2012-02-02 Rudolf Polzerapply the game type renames
2012-01-21 cbrutailMerge branch 'master' into cbrutail/darkzone
2012-01-20 SamualMerge remote branch 'origin/master' into samual/running...
2012-01-13 Rudolf PolzerMerge branch 'master' of git://de.git.xonotic.org/xonot...
2012-01-05 Rudolf Polzerrename of the map