]> 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: a19691c df33af4)
Merge branch 'master' into marin-t/fix
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)

Trivial merge