]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/menu/xonotic/dialog_hudpanel_score.c

Simple merge
Simple merge