]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/hud_config_shortcuts' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 9 Dec 2010 21:52:50 +0000 (22:52 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 9 Dec 2010 21:52:50 +0000 (22:52 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge