]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 17 Nov 2010 23:29:38 +0000 (00:29 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 17 Nov 2010 23:29:38 +0000 (00:29 +0100)
commit624fa13007d3628a0f6dc7d7a3557ee20d75f131
tree9746c276ea2c5182be4ea1b3d9a1ffcb6ebb89a4
parent728f7ac8782eb94023ca7450ffe4d31b5ddff6e8
parentb00574d6f1b85954013f1367517a9ee8ed832d3d
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/menu/xonotic/dialog_hudpanel_score.c