Merge branch 'master' into Mario/showspecs
authorMario <mario.mario@y7mail.com>
Mon, 27 Jan 2014 06:14:00 +0000 (17:14 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jan 2014 06:14:00 +0000 (17:14 +1100)
commit8e3b8efa99f2620f1665252ce41eeb87a1483e32
treec1433cfafedf8a6d379796f7861bef8d7d34aece
parent1649a77da3e957dbc722f2eb3af636725bb00a81
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge branch 'master' into Mario/showspecs
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc