]> 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, 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)
commit120e26841a6db8566b8b55f6a0625ff5bcf5d3ad
treee5a09b394d27b1511cd887605295320fcf96f210
parent1cda951835e929c5f6323425efbeebb96e2c6b2c
parent769b5c4039e008c6509de575d5afc9b6468cdfd7
Merge branch 'master' into cbrutail/translation-hu_0.6