Merge branch 'Mario/headshots' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:22:55 +0000 (03:22 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:22:55 +0000 (03:22 +0000)
Merge branch Mario/headshots (S merge request)

See merge request xonotic/xonotic-data.pk3dir!839

1  2 
qcsrc/server/miscfunctions.qh
qcsrc/server/weapons/tracing.qc

Simple merge
Simple merge