Merge branch 'master' into TimePath/experiments/csqc_prediction
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 08:53:04 +0000 (19:53 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 08:59:48 +0000 (19:59 +1100)
commitcd109cf922bc405155c680582745d645bd057ded
tree39ea9274725477ba609e4168a8c8cb4daeb03464
parent244e5081c5c503c307e557c98ac864f6c9731475
parent02013c593abe7ccb7c6502148df33b34390d8216
Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/command/banning.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qc
38 files changed:
defaultXonotic.cfg
qcsrc/common/playerstats.qc
qcsrc/common/weapons/weapons.qc
qcsrc/common/weapons/weapons.qh
qcsrc/dpdefs/progsdefs.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/item.qc
qcsrc/menu/item/button.qc
qcsrc/menu/item/checkbox.qc
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/inputbox.qc
qcsrc/menu/item/listbox.qc
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/item/nexposee.qc
qcsrc/menu/item/slider.qc
qcsrc/menu/menu.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/colorpicker.qc
qcsrc/menu/xonotic/colorpicker_string.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
qcsrc/menu/xonotic/dialog_singleplayer_winner.qc
qcsrc/menu/xonotic/gametypelist.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/menu/xonotic/languagelist.qc
qcsrc/menu/xonotic/maplist.qc
qcsrc/menu/xonotic/playerlist.qc
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/skinlist.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/banning.qc
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh
qcsrc/server/command/vote.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/t_items.qc