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

Trivial merge