From: nifrek <nifrek@gmail.com>
Date: Mon, 20 Jun 2011 20:59:14 +0000 (-0400)
Subject: Merge branch 'master' into nifrek/longjumpanim
X-Git-Tag: xonotic-v0.5.0~199^2~14
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=2ed522e70f508c67d1f64d73bc840646551115f6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into nifrek/longjumpanim
---

2ed522e70f508c67d1f64d73bc840646551115f6