From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 24 Sep 2015 22:31:33 +0000 (+0000)
Subject: Merge branch 'Mario/vaporizer_damage' into 'master'
X-Git-Tag: xonotic-v0.8.2~1917
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8da45596c76bb645e864b4ec8ff5a3ee13bbf27c;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
---

8da45596c76bb645e864b4ec8ff5a3ee13bbf27c