]> 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: 0dc71ba 428511f)
Merge branch 'master' into MaidenBeast/translation_updates
authorMaidenBeast <fel.sallustio@gmail.com>
Mon, 27 Jun 2011 11:29:05 +0000 (13:29 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Mon, 27 Jun 2011 11:29:05 +0000 (13:29 +0200)

Trivial merge