projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3fb02fb
a80e519
)
Merge branch 'divVerent/xoylent-sane-options'
author
Rudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000
(07:37 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000
(07:37 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff