]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/hud_configure
authorterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 23:12:21 +0000 (01:12 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 23:12:21 +0000 (01:12 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge