Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Sun, 4 Dec 2011 15:22:01 +0000 (16:22 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 4 Dec 2011 15:22:01 +0000 (16:22 +0100)
commite8c79ab816cecd061eec17f29d0b164bcfe7b22b
treed7db4db1688b8f33d4264cfffc414e7fc7b37d05
parentaafa0916c3efdaec615d9fe4c9ab3dc21f350c2f
parent96d653c418485a1d27107dba9407b57a3d02e9fc
Merge branch 'master' into terencehill/quickmenu
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/common/constants.qh