From: Rudolf Polzer Date: Tue, 25 May 2010 14:56:27 +0000 (+0200) Subject: Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik... X-Git-Tag: xonotic-v0.1.0preview~573 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f2920bc483e5517fc632495b03ccefe71872c628;ds=sidebyside Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik/ignisplayermodel', 'origin/diabolik/pyriaplayermodel', 'origin/diabolik/umbraplayermodel' and 'origin/diabolik/weaponscale' --- f2920bc483e5517fc632495b03ccefe71872c628