Merge remote-tracking branch 'origin/master' into samual/serverlist
authorSamual Lenks <samual@xonotic.org>
Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)
commit49af10f3413b96e52055359d42288dbf5ec6972b
tree350cda7409baf78624516dd7148a9dcc232513a4
parent4e0aea51ab6f3b9a6a6bf57dd6818de1eba2aba3
parent9944e4fec0952a1ccd79f416e366726a6c124877
Merge remote-tracking branch 'origin/master' into samual/serverlist
qcsrc/menu/xonotic/serverlist.c