Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel
authorterencehill <piuntn@gmail.com>
Fri, 10 Dec 2010 18:23:13 +0000 (19:23 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 10 Dec 2010 18:23:13 +0000 (19:23 +0100)
commitf209ef256e1c8cc09fcfb1cf3b3f30f34345e88b
tree70586ea5312b39a4c1856673f8205b6b90a74d2c
parent08c7e9870ce96fc1589edccf650dcfe1adb11c8c
parentd42a551dfd0a577ef65a0cd06a1474561c7f281e
Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel

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