]> 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: 448fb23 b8084ac)
Merge remote-tracking branch 'origin/MaidenBeast/translation_updates'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 7 Aug 2011 14:02:31 +0000 (16:02 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 7 Aug 2011 14:02:31 +0000 (16:02 +0200)

Trivial merge