]> 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: 0d98d1f 74511ae)
Merge remote-tracking branch 'origin/nifrek/duckanims'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:30:26 +0000 (10:30 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:30:26 +0000 (10:30 +0100)

Trivial merge