]> 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: 544b060 ec84c39)
Merge branch 'master' into terencehill/menu_hudskin_selector
authorterencehill <piuntn@gmail.com>
Sat, 28 Nov 2015 17:04:29 +0000 (18:04 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 28 Nov 2015 17:04:29 +0000 (18:04 +0100)

Trivial merge