From: merlijn Date: Fri, 13 May 2011 20:06:33 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/mirceakitsune/weapon_hagar_secondary_load' X-Git-Tag: xonotic-v0.5.0~263^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bdfd71723a38e659cf26a894e07d8f77a5a1e79f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/mirceakitsune/weapon_hagar_secondary_load' --- bdfd71723a38e659cf26a894e07d8f77a5a1e79f