From: Rudolf Polzer Date: Tue, 19 Oct 2010 05:47:27 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/tzork/turrets' X-Git-Tag: xonotic-v0.1.0preview~281 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73aacea5ecd160c845d8fdc15cacf443eddc79ca;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/tzork/turrets' --- 73aacea5ecd160c845d8fdc15cacf443eddc79ca