Merge remote-tracking branch 'origin/samual/serverlist' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 06:35:00 +0000 (02:35 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 06:35:00 +0000 (02:35 -0400)
commit915eaae02a08ea935c9c4b3ba7e5596fa1fbe9da
tree43d94afe3deab0d68d23859f39f214ed3fed8318
parenta31fe9da5a0c2fa0fa00b45f72f92ff275f25721
parent944cbcd95e7f43fc57dae10cfe6f5e1f6177cf42
Merge remote-tracking branch 'origin/samual/serverlist' into samual/combined_updates

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_join.c
qcsrc/common/util.qh
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_multiplayer_join.c
qcsrc/menu/xonotic/dialog_multiplayer_media.c