]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7965eb1 1a507ac)
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)

Trivial merge