]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/quickmenu_merge
authorMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:11:24 +0000 (09:11 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:11:24 +0000 (09:11 -0700)
commitffc3e200059f0ad92a5b2127f68837bf27afd956
tree30b30a1f43f1cb8d0c6e31072189651ab89f031b
parentc092ab283a53142d3c9658bab30ec38e21e44f8c
parentc9817f1dec9a45efdc4b617c42cc5ca907162b47
Merge branch 'master' into Mario/quickmenu_merge
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/util.qh