projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89ef2eb
877b821
)
Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes
author
Rudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 16:24:43 +0000
(18:24 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 16:24:43 +0000
(18:24 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff