From: Rudolf Polzer Date: Sat, 15 May 2010 18:14:42 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/tzork/turrets' X-Git-Tag: xonotic-v0.1.0preview~612 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=477b7b3e324bdb74aee19bfee925d708c7cf9758;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/tzork/turrets' --- 477b7b3e324bdb74aee19bfee925d708c7cf9758