Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 13 Jan 2014 16:42:58 +0000 (11:42 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 13 Jan 2014 16:42:58 +0000 (11:42 -0500)
commitc07a907b93f175325805959e59b844d1c37b80f4
tree2bf65afd563c741ef04a4064eb73b0f8f6c7c3b6
parent8bd68838f6d478c8aa6a4aef95499ffc404c2e7d
parent79af1d0a6a91cc42a4359ecdae84a9fa72593731
Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
qcsrc/common/util.qh
qcsrc/menu/xonotic/dialog_multiplayer_create.c
24 files changed:
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/menu.qc
qcsrc/menu/progs.src
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src