]> 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: 56b6c26 1a7bc6c)
Merge branch 'master' into terencehill/modified_default_cvars 299/head
authorterencehill <piuntn@gmail.com>
Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)

Trivial merge