]> 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: 99c1b6c ab15353)
Merge branch 'master' into terencehill/menu_listbox_changes
authorterencehill <piuntn@gmail.com>
Tue, 11 Aug 2015 17:48:06 +0000 (19:48 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 11 Aug 2015 17:48:06 +0000 (19:48 +0200)

Trivial merge