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)
commit2e05a1d8421ee2cbb604582d644133500aae2450
tree93451fda77c81c1a2a1fba906c944f447e018124
parent77d98212622acadc3ed0c658c890a949805e0bdf
parente30214cf338291f1709fb02ed5e84cad9321e156
Merge branch 'Mario/setresourceamount' into 'master'

Merge branch Mario/setresourceamount (S merge request)

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