]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af56060 33e3b90)
Merge branch 'Mario/no_dedicated_win_icon' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 19 Aug 2019 10:15:37 +0000 (10:15 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 19 Aug 2019 10:15:37 +0000 (10:15 +0000)
Merge branch Mario/no_dedicated_win_icon (XXS merge request)

Closes #216

See merge request xonotic/xonotic!56


Trivial merge