projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8632222
a0e1d77
)
Merge remote branch 'origin/tzork/glowplant'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:53:18 +0000
(08:53 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:53:18 +0000
(08:53 +0100)
Conflicts:
maps/glowplant.map (taking over tZork's new versions, throwing away in between changes on master)
Trivial merge