]> 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: 59ee6e0 ea3a018)
Merge remote-tracking branch 'origin/sev/menu_maplist_controls'
authorMario <zacjardine@y7mail.com>
Sat, 15 Nov 2014 07:30:19 +0000 (18:30 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 15 Nov 2014 07:30:19 +0000 (18:30 +1100)

Trivial merge