Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 03:50:18 +0000 (22:50 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 03:50:18 +0000 (22:50 -0500)
commit0ab7132eba1a94b5ec19efe5a3f5f63071ed80ff
treefc05c4b73ab8a52bf10ee234f8e51a5e32a9dc51
parent3be8564ecb6ae5fa049970ee5e6bff90685bf57c
parent3f195c9c45d7cbe2b7059e320f99493b433121f7
Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
qcsrc/client/View.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c
qcsrc/menu/xonotic/dialog_multiplayer_profile.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/dialog_settings_game_view.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_user.c
qcsrc/menu/xonotic/dialog_settings_video.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc
22 files changed:
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/common/util.qc
qcsrc/dpdefs/menudefs.qc
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.c
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
qcsrc/menu/xonotic/dialog_multiplayer_profile.c
qcsrc/menu/xonotic/dialog_settings_audio.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/dialog_settings_game_hud.c
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c
qcsrc/menu/xonotic/dialog_settings_game_model.c
qcsrc/menu/xonotic/dialog_settings_game_view.c
qcsrc/menu/xonotic/dialog_settings_game_weapons.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_user.c
qcsrc/menu/xonotic/dialog_settings_video.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/serverlist.c
qcsrc/menu/xonotic/util.qc
qcsrc/server/cl_client.qc