Merge branch 'master' into 'translate_desktop' 57/head
authorWuzzy <wuzzy2@mail.ru>
Fri, 27 Sep 2019 20:47:09 +0000 (20:47 +0000)
committerWuzzy <wuzzy2@mail.ru>
Fri, 27 Sep 2019 20:47:09 +0000 (20:47 +0000)
commit12e4ebadb58dc51ccacff8291a3db115f6675814
treed25d858f10145fd337709dc7a549c24b68b2dd22
parent04b89372a03bbdf7d9f70130ba2b55d2a48085f4
parentf68b64233374303abb0abcdb26033c17834bc826
Merge branch 'master' into 'translate_desktop'

# Conflicts:
#   misc/logos/xonotic-glx.desktop
#   misc/logos/xonotic.appdata.xml
#   misc/logos/xonotic.desktop
misc/logos/xonotic-glx.desktop
misc/logos/xonotic.appdata.xml
misc/logos/xonotic.desktop