Merge branch 'terencehill/assault_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:21:35 +0000 (00:21 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 8 Feb 2018 00:21:35 +0000 (00:21 +0000)
commit9366bc8fa80268a5cc80044db3f38f98ecfea3e6
tree431e3a0fd430a03cd4c2037e8a2788504562b7f9
parentd1a04af7ca97a80d6b0d347e8d4ba78dbd1fc48b
parentbac65e0029d745e343b1a774cd3399f2a99153c3
Merge branch 'terencehill/assault_fix' into 'master'

Assault fix

Closes #1944

See merge request xonotic/xonotic-data.pk3dir!523
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/weapons/weaponsystem.qc