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)
1  2 
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/mapvoting.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge