]> 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: 0fe01be 2c0e09d)
Merge branch 'master' into martin-t/switchdelay martin-t/switchdelay
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 9 Dec 2019 11:02:45 +0000 (12:02 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 9 Dec 2019 11:02:45 +0000 (12:02 +0100)

Trivial merge