[meld: 3/3] Merge branch 'icons-fixups' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit 8139bfad76df74eb7edfa3b5d2dba9e1b6dc8226
Merge: c759fa15 4fdbbc70
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Jun 15 22:03:04 2020 +0000

    Merge branch 'icons-fixups' into 'master'
    
    Fix icon in about dialog (all platforms) and application window icon for linux non-GNOME
    
    See merge request GNOME/meld!58

 bin/meld                           |   1 +
 data/icons/svg/meld-vc-icon-22.svg | 561 -------------------------------
 data/icons/svg/meld-vc-icon.svg    | 668 -------------------------------------
 meld/build_helpers.py              |   1 +
 meld/resources/meld.gresource.xml  |   4 +
 meld/resources/meson.build         |   5 +-
 6 files changed, 10 insertions(+), 1230 deletions(-)
---