From: Rudolf Polzer Date: Fri, 27 May 2011 18:49:46 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/samual/no_dead_airshots' X-Git-Tag: xonotic-v0.5.0~215^2~8 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7f2227f07a84c570ba8e289d313c7da3453fb55f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/no_dead_airshots' --- 7f2227f07a84c570ba8e289d313c7da3453fb55f