From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Feb 2019 16:33:28 +0000 (+0000)
Subject: Merge branch 'Mario/setresourceamount' into 'master'
X-Git-Tag: xonotic-v0.8.5~1614
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e05a1d8421ee2cbb604582d644133500aae2450;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/setresourceamount' into 'master'

Merge branch Mario/setresourceamount (S merge request)

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

2e05a1d8421ee2cbb604582d644133500aae2450