From: Rudolf Polzer Date: Wed, 9 Feb 2011 12:31:06 +0000 (+0100) Subject: Merge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elev... X-Git-Tag: xonotic-v0.5.0~107 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=819e424375873fadd886be613277b6ee42a6061d Merge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elevator-beamfix' --- 819e424375873fadd886be613277b6ee42a6061d