Merge branch 'master' into itsme/vorix
[xonotic/xonotic-maps.pk3dir.git] / textures / exomorphx /
2014-11-29 MarioMerge branch 'master' into itsme/vorix
2013-09-01 MarioMerge branch 'master' into Mario/monsters
2013-08-14 Rudolf PolzerRevert "moving 2 textures to 'base'"
2013-08-14 Rudolf PolzerRevert "renaming a few textures" as that breaks existin...
2013-08-14 Rudolf PolzerMerge remote-tracking branch 'origin/debugger/exomorphx...
2013-08-12 Debuggermoving 2 textures to 'base'
2013-08-11 Debuggerrenaming a few textures
2013-06-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
2013-05-18 Debuggermore textures for the exomorphx texture set; extended...
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-09-01 Rudolf Polzeruse match8 here too
2011-08-30 Rudolf PolzerSquashed commit of the following (exomorph by morphed):