]> 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: d20abc7 6a8fd12)
Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim
authornifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 15:48:47 +0000 (11:48 -0400)
committernifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 15:48:47 +0000 (11:48 -0400)

Trivial merge