]> 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: 8d3a448 148ce7b)
Merge remote branch 'origin/terencehill/translated_mapvote_title'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 11 Jul 2011 07:03:28 +0000 (09:03 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 11 Jul 2011 07:03:28 +0000 (09:03 +0200)

Trivial merge