]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic...
authorMario <mario.mario@y7mail.com>
Sun, 5 Jan 2014 03:55:29 +0000 (14:55 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 5 Jan 2014 03:55:29 +0000 (14:55 +1100)
1  2 
qcsrc/client/hud.qc

Simple merge