]> 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: 072d947 142fd6d)
Merge remote-tracking branch 'origin/MaidenBeast/italian_translation'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 6 Jun 2011 19:11:14 +0000 (21:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 6 Jun 2011 19:11:14 +0000 (21:11 +0200)

Trivial merge