Merge branch 'master' into Mario/showspecs
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:59:14 +0000 (08:59 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:59:14 +0000 (08:59 +1000)
commite921ae9f86a09d0a20cd4c72b44e6d71d25975ea
treea11f37a04aececcc400fdb530340a62959e1cf30
parent8e3b8efa99f2620f1665252ce41eeb87a1483e32
parent4566767f430d7a15f918d80b234f04c71f929b4e
Merge branch 'master' into Mario/showspecs

Conflicts:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/server/cl_client.qc