From: Rudolf Polzer Date: Fri, 19 Nov 2010 11:42:47 +0000 (+0100) Subject: Merge remote branch 'origin/tzork/turrets-assualt-fix' X-Git-Tag: xonotic-v0.1.0preview~118 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9a65bdc31122541c466f1fd3466fd77e050fbc0c;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/tzork/turrets-assualt-fix' --- 9a65bdc31122541c466f1fd3466fd77e050fbc0c