Merge remote-tracking branch 'origin/master' into terencehill/cursormode
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Dec 2012 20:44:39 +0000 (15:44 -0500)
commitfcbf9538330960b989dbe84e7188349d7e8b109f
tree50460bf8f7fc0429460c6d13a6aa4637975ceba8
parent4524af86ee6190c8d7f7cd7ccc068650809a0ce7
parent77c8f18d6cf54ac0c0b1e426ac79842e7f593c80
Merge remote-tracking branch 'origin/master' into terencehill/cursormode
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/mapvoting.qc