projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86cdab1
adc73f2
)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
author
Rudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000
(08:22 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000
(08:22 +0200)
Trivial merge