]> 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: ddc2ea9 f260e13)
Merge branch 'master' into terencehill/menu_listbox_changes
authorterencehill <piuntn@gmail.com>
Sat, 1 Aug 2015 20:18:20 +0000 (22:18 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 1 Aug 2015 20:18:20 +0000 (22:18 +0200)
1  2 
qcsrc/menu/xonotic/serverlist.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/xonotic/serverlist.qc
Simple merge