projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c9afaf
d68ae5e
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
author
Rudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:33:39 +0000
(16:33 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:33:39 +0000
(16:33 +0200)
Trivial merge