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)
commit99c1b6ca80a69e112d410ee493d62f757b2c6df8
treeaec9d4ccb5beaa747f995e773e0cb11b6dce3e46
parentddc2ea94dd4703e38f1ccec825007dcb9d88c650
parentf260e137aa3c5096e704f5e0a969ad69c079d884
Merge branch 'master' into terencehill/menu_listbox_changes
qcsrc/menu/xonotic/serverlist.qc