]> 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 21:11:42 +0000 (17:11 -0400)
committernifrek <nifrek@gmail.com>
Mon, 20 Jun 2011 21:11:42 +0000 (17:11 -0400)
commitd4ef2d3a8fb9f2710fb2038ed7cb82725f9c9d27
tree71f921765113ae5eb2cd9efdb893aa92ead3223f
parent2ed522e70f508c67d1f64d73bc840646551115f6
parentd8b3f7a704b226d8d3c2bed9e11f25401f913bdd
Merge branch 'master' into nifrek/longjumpanim