From: Mario <zacjardine@y7mail.com>
Date: Mon, 2 Jan 2017 08:05:02 +0000 (+0000)
Subject: Merge branch 'martin-t/ok_weap' into 'master'
X-Git-Tag: xonotic-v0.8.2~331
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53ae0010b81fef4c01ccea1ab46be6dcd1bfb81f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/ok_weap' into 'master'

overkill: take into account last weapon held when switching while dead

Closes #1728

See merge request !400
---

53ae0010b81fef4c01ccea1ab46be6dcd1bfb81f