]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7482840 348a4b3)
Merge remote branch 'origin/diabolik/credits-update'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)

Trivial merge