Merge branch 'master' into terencehill/cursormode
authorterencehill <piuntn@gmail.com>
Sun, 29 Jan 2012 15:39:57 +0000 (16:39 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 29 Jan 2012 15:39:57 +0000 (16:39 +0100)
commit7e0864d035fea38e3127a0728909641536c1a99d
tree89e5c3cd1456394c7f34a835ad5d0638ec662890
parentfbec40012e84855d10d0f99f2ead025aca3153c6
parent5c3c652b2dfd2191a415365a7931fc714ec2eacb
Merge branch 'master' into terencehill/cursormode

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/csqc_builtins.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc