From: Mario <zacjardine@y7mail.com>
Date: Tue, 14 Jun 2016 13:30:30 +0000 (+0000)
Subject: Merge branch 'Mario/entrap_nade' into 'master'
X-Git-Tag: xonotic-v0.8.2~807
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49260b6ae3d0ffae7f73abe2da1d8a35859b162d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/entrap_nade' into 'master'

Merge branch Mario/entrap_nade (M merge request)

Adds a new nade type; Entrap (slows down enemies that enter the large orb, lasts 10 seconds)

See merge request !324
---

49260b6ae3d0ffae7f73abe2da1d8a35859b162d