]> 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: 77d9821 e30214c)
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