Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Sat, 23 May 2015 11:13:22 +0000 (13:13 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 23 May 2015 11:13:22 +0000 (13:13 +0200)
commitb09b7687da385e1cdc51e2f63fb7de4c9f9e12a3
tree16155839f6bd25b072d63b838427f4c57f09b10e
parenta96096dbc3be796d0b5fc0ab8528cd7b8d9e0b03
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge branch 'master' into terencehill/quickmenu

Conflicts:
qcsrc/client/hud.qh
qcsrc/menu/classes.inc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qh
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc
qcsrc/menu/classes.inc
qcsrc/menu/xonotic/mainwindow.qc