]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into nifrek/longjumpanim
authornifrek <nifrek@gmail.com>
Mon, 20 Jun 2011 20:59:14 +0000 (16:59 -0400)
committernifrek <nifrek@gmail.com>
Mon, 20 Jun 2011 20:59:14 +0000 (16:59 -0400)
commit2ed522e70f508c67d1f64d73bc840646551115f6
treec2776b5911d9f840f570be84bb2a5cd06e209e68
parent7965eb1575ea5d94d27c07f7897c95a4c1802870
parent1a507acfe146c88e76d252ddec4242210ac8923f
Merge branch 'master' into nifrek/longjumpanim