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