projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9295172
fdfbabb
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000
(20:52 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000
(20:52 +0200)
Trivial merge