Merge remote branch 'origin/tzork/turrets-assualt-fix'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)
commit9a65bdc31122541c466f1fd3466fd77e050fbc0c
tree6a44d69abd9b831ebe5314c9dfada9527e41b662
parent13637d81dbfcbb1759ea59563b2d4430b0ed2a84
parent16e148e5ac10ff9485d3d745b23ed4202ab709b5
Merge remote branch 'origin/tzork/turrets-assualt-fix'