Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 9 Dec 2010 18:02:57 +0000 (19:02 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 9 Dec 2010 18:02:57 +0000 (19:02 +0100)
commit5dc4bd363b8216f79266979e39a3cbb60a9ffe94
tree8e0e43b7fad60559af25f2a80c5c97979271aef6
parentab52427d751a4d99e55504aadae01a2d3526dd36
parent2cadc72988aea7350f32343cf31adeeddade0c8e
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/client/teamradar.qc