]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/history - scripts/effects_healpod.shader
Fix conflict
[xonotic/xonotic-maps.pk3dir.git] / scripts / effects_healpod.shader
2013-06-20 ItsMeMerge branch 'xonotic-maps.pk3dir/itsme/vorix' of git...
2011-10-03 cbrutailMerge branch 'master' into cbrutail/map-lightspeed
2011-09-03 Rudolf Polzerfix some shader bugs
2010-11-15 FruitieXMerge branch 'master' into savagex/techassault
2010-10-09 Maik MertenMerge branch 'morphed/ionpump' of ssh://git.xonotic...
2010-10-02 FruitieXMerge remote branch 'origin/master' into fruitiex/runni...
2010-09-28 Rudolf PolzerMerge commit 'c87167c'
2010-09-28 Rudolf PolzerMerge branch 'master' into divVerent/archived/fruitiex...
2010-09-25 Rudolf Polzeradapt to shader naming convention
2010-09-25 Rudolf Polzersplit up xonotic-fx.shader