]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/history - maps/solarium.map
merge conflict
[xonotic/xonotic-maps.pk3dir.git] / maps / solarium.map
2017-02-20 Miriomerge conflict
2016-12-27 MirioUpdate maps with new entity maps
2015-09-04 MirioSet author, message and _description in map files
2015-03-06 Matthias KrügerMerge branch 'master' into matthiaskrgr/hudsetup
2015-02-08 Matthias KrügerMerge branch 'master' into matthiaskrgr/dance
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into debug...
2015-01-24 MarioMerge remote-tracking branch 'origin/master' into maddi...
2015-01-23 MirioMerge branch 'master' into mirio/glowplant
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-06-17 MirioFix Bug #1242 and make all barells consistent for Court...
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-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/kuniuthefrogg...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/Mirio/leave_em_behind'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/samual/cortez...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/cbrutail/nexballar...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/glowplant'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/newtonian...
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/debugger/courtfun'
2013-05-14 Samual LenksMerge remote-tracking branch 'origin/Mirio/solarium'
2013-04-21 MirioBarrels go boom
2013-04-21 MirioBarrels go boom
2013-04-21 MirioMap cleanup, mapinfo, screenshot, waypoints
2013-03-01 kuniuthefroggMerge branch 'kuniuthefrogg/abyss' of ssh://push.git...
2013-02-10 Samual LenksMerge remote-tracking branch 'origin/master' into kuniu...
2013-01-29 Rudolf PolzerMerge remote-tracking branch 'origin/morphed/pillar...
2012-08-28 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2012-08-28 Samual LenksAdd info_autoscreenshot entities to 11 more maps
2012-04-04 MirceaKitsuneMerge branch 'master' into mirceakitsune/world_cubemaps
2012-03-06 Rudolf PolzerSquashed commit of the following: