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

Simple merge