]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 29 Jan 2012 12:50:50 +0000 (13:50 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 29 Jan 2012 12:50:50 +0000 (13:50 +0100)
1  2 
csprogs.dat.de.po

Simple merge