]> 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 | combined (merge: 3ae1a63 d140b4a)
Merge branch 'master' into cbrutail/translation-hu_0.6
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 11:27:02 +0000 (12:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 11:27:02 +0000 (12:27 +0100)

Trivial merge