Merge branch 'Mario/buff_timer' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 17 Aug 2019 14:49:54 +0000 (14:49 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 17 Aug 2019 14:49:54 +0000 (14:49 +0000)
commitce491d5d46adc539776d175c258e8e89405689c8
treeff92b2b603219ba4eb1927be1c35e8b7511f1a0e
parent1cf26eb87f64684fbaf21afb70b893a6bebc02e2
parentf2d431dd131d113fcd77bfa6c61271239d3b3c41
Merge branch 'Mario/buff_timer' into 'master'

Merge branch Mario/buff_timer (M merge request)

See merge request xonotic/xonotic-data.pk3dir!676
qcsrc/common/t_items.qc
qcsrc/server/client.qc