]> 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: 8e89e78 313c2a9)
Merge branch 'master' into Lyberta/GiveResourceWithLimit
authorLyberta <lyberta@lyberta.net>
Tue, 27 Mar 2018 23:08:52 +0000 (02:08 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 27 Mar 2018 23:08:52 +0000 (02:08 +0300)

Trivial merge