From: Mario <zacjardine@y7mail.com>
Date: Sun, 21 Feb 2016 07:03:24 +0000 (+0000)
Subject: Merge branch 'Mario/balance_v2' into 'master'
X-Git-Tag: xonotic-v0.8.2~1181
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f34e36384aea3cb5e6c6818de704e6da2ee125b5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/balance_v2' into 'master'

Merge branch Mario/balance_v2 (Small merge request)

Some small adjustments to the weapon balance (mainly for the arc).

See merge request !281
---

f34e36384aea3cb5e6c6818de704e6da2ee125b5