]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a6b819 af92772)
Merge branch 'master' of gitlab.com:xonotic/xonotic
authorRudolf Polzer <divVerent@gmail.com>
Thu, 8 Jul 2021 19:24:09 +0000 (21:24 +0200)
committerRudolf Polzer <divVerent@gmail.com>
Thu, 8 Jul 2021 19:24:09 +0000 (21:24 +0200)

Trivial merge