]> 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: 1cda951 769b5c4)
Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 16 Feb 2012 15:42:08 +0000 (16:42 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 16 Feb 2012 15:42:08 +0000 (16:42 +0100)

Trivial merge