]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/cursor
authorMario <mario@smbclan.net>
Mon, 25 Jun 2018 06:23:01 +0000 (16:23 +1000)
committerMario <mario@smbclan.net>
Mon, 25 Jun 2018 06:23:01 +0000 (16:23 +1000)
1  2 
qcsrc/client/hud/hud.qh
qcsrc/client/hud/panel/radar.qc
qcsrc/client/main.qc

Simple merge
Simple merge
Simple merge