Merge branch 'master' into Mario/showspecs
authorMario <mario@smbclan.net>
Sun, 12 Jun 2016 10:43:18 +0000 (20:43 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Jun 2016 10:43:18 +0000 (20:43 +1000)
commiteac60648c4017e495060dd3ba9e50ac4bad5000a
tree853c6332e4a0fdd59bf60181badeafc833aee337
parente921ae9f86a09d0a20cd4c72b44e6d71d25975ea
parent5111c4a32e3439a9d98dde5c2dc82e76a17af6d5
Merge branch 'master' into Mario/showspecs

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/main.qc
# qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/server/cl_client.qc