]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8cfb5c 5288b1f)
Merge branch 'Mario/crypto_linux' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 8 Dec 2020 13:55:08 +0000 (13:55 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 8 Dec 2020 13:55:08 +0000 (13:55 +0000)
Merge branch Mario/crypto_linux (XXS merge request)

See merge request xonotic/xonotic!74


Trivial merge