Merge branch 'Mario/setresourceamount' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 3 Feb 2019 16:33:28 +0000 (16:33 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 3 Feb 2019 16:33:28 +0000 (16:33 +0000)
Merge branch Mario/setresourceamount (S merge request)

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


Trivial merge