Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 17:05:57 +0000 (18:05 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 17:05:57 +0000 (18:05 +0100)
commit0040a3c181e225fa7e1c38b9de5314e23ac7063a
treeb21817b5a5c366ebc76235468400df6a23dce2ce
parent1ede9051ad4efda4a90da15e6700fe6a23032334
parentdcf8a85693db60468fde21e1eaa64043576edb0d
Merge branch 'master' into terencehill/quickmenu

Conflicts:
_hud_descriptions.cfg
common.it.po
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
19 files changed:
_hud_common.cfg
_hud_descriptions.cfg
common.it.po
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
keybinds.txt
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/mapvoting.qc
qcsrc/client/scoreboard.qc
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c