]> 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: 248a331 aab81d1)
Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim
authornifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 16:25:16 +0000 (12:25 -0400)
committernifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 16:25:16 +0000 (12:25 -0400)

Trivial merge