From: nifrek Date: Wed, 15 Jun 2011 16:25:16 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim X-Git-Tag: xonotic-v0.5.0~199^2~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9b9ae97733ac4ecef8b5368bcceea13061df5608;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim --- 9b9ae97733ac4ecef8b5368bcceea13061df5608