From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 28 Oct 2015 07:30:37 +0000 (+0000)
Subject: Merge branch 'TimePath/independent_offhand' into 'master'
X-Git-Tag: xonotic-v0.8.2~1767
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd56fad16f10856522e381bbecdfb887f86b0f8e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/independent_offhand' into 'master'

Independent offhand (M merge request)

Fixes grappling hook offhand delaying onhand attack

See merge request !247
---

dd56fad16f10856522e381bbecdfb887f86b0f8e