]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/newpanelhud' into terencehill/speedpanel
authorterencehill <piuntn@gmail.com>
Wed, 1 Dec 2010 18:03:05 +0000 (19:03 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 1 Dec 2010 18:03:05 +0000 (19:03 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge