projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1ce1a1b
2ef922a
)
Merge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps...
author
cbrutail <ruszkai.akos@gmail.com>
Fri, 6 Jan 2012 15:59:24 +0000
(16:59 +0100)
committer
cbrutail <ruszkai.akos@gmail.com>
Fri, 6 Jan 2012 15:59:24 +0000
(16:59 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff