]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6bb286 4d42bd0)
Merge branch 'terencehill/superspec_fixes' into debugger/superspec_options
authorDebugger <pyngot@hotmail.com>
Tue, 13 Aug 2013 13:58:19 +0000 (15:58 +0200)
committerDebugger <pyngot@hotmail.com>
Tue, 13 Aug 2013 13:58:19 +0000 (15:58 +0200)

Trivial merge