]> 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: c003b56 67440b9)
Merge branch 'master' into Lyberta/GiveResourceWithLimit
authorLyberta <lyberta@lyberta.net>
Mon, 19 Mar 2018 15:58:09 +0000 (18:58 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 19 Mar 2018 15:58:09 +0000 (18:58 +0300)

Trivial merge