projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
dee94e9
9e1249a
)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
author
Rudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 14:34:33 +0000
(15:34 +0100)
committer
Rudolf Polzer <divverent@xonotic.org>
Fri, 30 Dec 2011 14:34:33 +0000
(15:34 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff