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'
author
Rudolf Polzer <divVerent@xonotic.org>
Mon, 11 Jul 2011 07:03:28 +0000
(09:03 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Mon, 11 Jul 2011 07:03:28 +0000
(09:03 +0200)
Trivial merge