Merge remote-tracking branch 'origin/fruitiex/runningmanfix'
[xonotic/xonotic-maps.pk3dir.git] / models / xonotic_jumppad01 / jumppad2lod_blue_glow.tga
2011-05-18 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-03-19 Maik MertenMerge branch 'master' of ssh://git.xonotic.org/xonotic...
2011-01-26 Rudolf PolzerMerge remote branch 'origin/tzork/glowplant'
2010-11-26 FruitieXMerge remote branch 'origin/master' into fruitiex/freez...
2010-11-24 FruitieXMerge remote branch 'origin/master' into savagex/techas...
2010-11-18 Rudolf PolzerMerge remote branch 'origin/fruitiex/red-planet-zfight'
2010-11-17 FruitieXMerge branch 'master' into fruitiex/runningmanctf
2010-11-16 Rudolf PolzerMerge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb...
2010-11-15 cbrutailFixed red launcpad lod skin typo, and added glowmaps...