]> 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: 69fb3ad 8e8fdc3)
Merge remote branch 'origin/tzork/credits-update'
authorJakob MG <jakob_mg@hotmail.com>
Tue, 3 May 2011 18:51:15 +0000 (20:51 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 3 May 2011 18:51:15 +0000 (20:51 +0200)

Trivial merge