]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce491d5 f3b3733)
Merge branch 'Mario/force_zscale' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 17:21:53 +0000 (17:21 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 17:21:53 +0000 (17:21 +0000)
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


Trivial merge