]> 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: 8d04a8d 623611d)
Merge branch 'master' into divVerent/german-translation
authorRudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 09:28:22 +0000 (10:28 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 09:28:22 +0000 (10:28 +0100)

Trivial merge