From: Mario <zacjardine@y7mail.com>
Date: Mon, 31 Aug 2015 14:19:12 +0000 (+0000)
Subject: Merge branch 'Mario/vaporizer_damage' into 'master'
X-Git-Tag: xonotic-v0.8.2~1939
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f18147409b828fe58bf9aaa0b2a00eb3b7225471;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/vaporizer_damage' into 'master'

Merge branch Mario/vaporizer_damage (S merge request)

Adds a damage option to the vaporizer, fixes support for bonus nades

See merge request !215
---

f18147409b828fe58bf9aaa0b2a00eb3b7225471