projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7b63a4
cd4efdb
)
Merge remote branch 'origin/TickleMeElmo/UpdateServerMaps'
author
Rudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:15:30 +0000
(10:15 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:15:30 +0000
(10:15 +0200)
Trivial merge
projects / xonotic / xonotic.git / commitdiff