Merge branch 'morosophos/defrag-haste2' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:24:45 +0000 (11:24 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:24:45 +0000 (11:24 +0000)
Rebase q3 haste changes on top of Mario's buff timers work

Closes #2228

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

1  2 
qcsrc/common/physics/player.qc
qcsrc/server/autocvars.qh
ruleset-XDF.cfg
xonotic-server.cfg

Simple merge
Simple merge
diff --cc ruleset-XDF.cfg
Simple merge
Simple merge