From: Samual Lenks Date: Sat, 21 Jul 2012 19:16:23 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/spawn_weapons X-Git-Tag: xonotic-v0.8.0~152^2~408^2~74 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd39f7688ab0c31e7d598ea928559ada88524449;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/spawn_weapons --- bd39f7688ab0c31e7d598ea928559ada88524449