]> de.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: 43af3eb aacc391)
Merge branch 'terencehill/quickmenu_fixes'
authorterencehill <piuntn@gmail.com>
Mon, 12 Mar 2018 22:14:09 +0000 (23:14 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 12 Mar 2018 22:14:09 +0000 (23:14 +0100)

Trivial merge