]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e2684d 0f459e8)
Merge branch 'master' into martin-t/stalemate
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 16 Dec 2019 13:36:23 +0000 (14:36 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 16 Dec 2019 13:36:23 +0000 (14:36 +0100)

Trivial merge