]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7047158 9304e64)
Merge remote-tracking branch 'upstream/master' into update-windows-dlls
authorincognico <nico@lifeisabug.com>
Tue, 7 Jul 2020 13:18:52 +0000 (15:18 +0200)
committerincognico <nico@lifeisabug.com>
Tue, 7 Jul 2020 13:18:52 +0000 (15:18 +0200)

Trivial merge