]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into sev/hud_ctf_update
authorMario <mario@smbclan.net>
Tue, 19 Jul 2016 08:36:50 +0000 (18:36 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jul 2016 08:36:50 +0000 (18:36 +1000)
1  2 
qcsrc/client/hud/panel/modicons.qc

Simple merge