]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/quickmenu_merge
authorMario <mario.mario@y7mail.com>
Fri, 8 Nov 2013 08:33:49 +0000 (19:33 +1100)
committerMario <mario.mario@y7mail.com>
Fri, 8 Nov 2013 08:33:49 +0000 (19:33 +1100)
commit14795863ffe0b7c2859794da85ae3b885b21d159
tree1f00c487172e55da0adcefeba859b9ea2a817046
parent24b3e74d336b3a9f889f384a9cf05e9dee4232a1
parent76070ae3f5dce896143cef5d289083bb078de4fd
Merge branch 'master' into Mario/quickmenu_merge
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/mainwindow.c