]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 16:40:06 +0000 (03:40 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 16:40:06 +0000 (03:40 +1100)
1  2 
qcsrc/client/hud.qc

Simple merge