]> 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: 69ec45b f9fe065)
Merge remote-tracking branch 'origin/cbrutail/translation-hun'
authormerlijn <mhofstra@gmail.com>
Wed, 28 Dec 2011 19:01:50 +0000 (20:01 +0100)
committermerlijn <mhofstra@gmail.com>
Wed, 28 Dec 2011 19:01:50 +0000 (20:01 +0100)

Trivial merge