]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 26 Jan 2012 11:25:55 +0000 (12:25 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 26 Jan 2012 11:25:55 +0000 (12:25 +0100)
commit5cd943bfb2c35a9caf708cc1bacdb6271abbfce1
tree793889a86b470d856ca67f75583d8d186e0f306e
parent3ae1a63e682f467f0670c4bf050eee618ba99d80
parentd140b4a6e34c3084ec56ee949a7f16fd8e504196
Merge branch 'master' into cbrutail/translation-hu_0.6