]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4370079 916a92d)
Merge branch 'Mario/win64_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 2 Oct 2018 14:44:49 +0000 (14:44 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 2 Oct 2018 14:44:49 +0000 (14:44 +0000)
Merge branch Mario/win64_v2 (S merge request)

See merge request xonotic/xonotic!44


Trivial merge