]> 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 | compact (merge: 4485340 eb6fabc)
Merge branch 'master' into terencehill/menu_hudskin_selector
authorterencehill <piuntn@gmail.com>
Tue, 8 Dec 2015 14:33:21 +0000 (15:33 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 8 Dec 2015 14:33:21 +0000 (15:33 +0100)

Trivial merge