Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic...
authorMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:13:26 +0000 (09:13 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:13:26 +0000 (09:13 -0700)
1  2 
qcsrc/client/hud.qc

Simple merge