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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge