]> 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 | compact (merge: 51c3ad8 abbe170)
Merge branch 'master' into cbrutail/translation-hu_0.6
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 23 Feb 2012 21:39:48 +0000 (22:39 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 23 Feb 2012 21:39:48 +0000 (22:39 +0100)
Conflicts:
menu.dat.hu.po

merge master, but keep the since modified files in local


Trivial merge