]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/hud_config_fixes
authorterencehill <piuntn@gmail.com>
Wed, 18 Jan 2012 17:12:30 +0000 (18:12 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 18 Jan 2012 17:12:30 +0000 (18:12 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge