]> 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: 7d88bb1 1a372e0)
Merge branch 'master' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 10:29:46 +0000 (12:29 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 10:29:46 +0000 (12:29 +0200)

Trivial merge