projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a20d92a
44dd4be
)
Merge remote branch 'origin/savagex/red-planet-fixes'
author
Rudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 15:07:42 +0000
(16:07 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 15:07:42 +0000
(16:07 +0100)
Trivial merge