From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 17 Aug 2019 17:21:53 +0000 (+0000)
Subject: Merge branch 'Mario/force_zscale' into 'master'
X-Git-Tag: xonotic-v0.8.5~1388
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c1e56f26fd675c3606d34b3afa94e3889ff4350;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/force_zscale' into 'master'

Merge branch Mario/force_zscale (S merge request)

Fixes all the weapons referencing blaster's force cvar.

See merge request xonotic/xonotic-data.pk3dir!684
---

3c1e56f26fd675c3606d34b3afa94e3889ff4350