Merge remote-tracking branch 'origin/master' into terencehill/hud_configure
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:39:24 +0000 (13:39 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:39:24 +0000 (13:39 +1000)
commit5f9a104fb3f5ef5f8a68d671425290ea8a6f9843
tree4812299149b09b5980696bf6805a01abfc329976
parentd7561df40d3fd89c2ddc36317e8fb6b5e90b493d
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge remote-tracking branch 'origin/master' into terencehill/hud_configure

# Conflicts:
# qcsrc/menu/xonotic/mainwindow.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/menu/item/container.qc
qcsrc/menu/xonotic/mainwindow.qc