[meld: 2/2] Merge branch 'app-icon-update' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit b6d17fe63a1f0f739060b65a3ad24b92342a072b
Merge: 9f6c9e0e caad9521
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon May 27 09:30:19 2019 +0000

    Merge branch 'app-icon-update' into 'master'
    
    icon: Update app icon
    
    Closes #315
    
    See merge request GNOME/meld!33

 MANIFEST.in                                        |   3 +-
 .../HighContrast/scalable/apps/org.gnome.meld.svg  | 232 ------
 data/icons/Makefile                                |   3 +-
 data/icons/README                                  |  11 +-
 data/icons/hicolor/16x16/apps/meld.xcf             | Bin 3823 -> 0 bytes
 data/icons/hicolor/16x16/apps/org.gnome.meld.png   | Bin 799 -> 0 bytes
 data/icons/hicolor/22x22/apps/meld.xcf             | Bin 6846 -> 0 bytes
 data/icons/hicolor/22x22/apps/org.gnome.meld.png   | Bin 1366 -> 0 bytes
 data/icons/hicolor/32x32/apps/org.gnome.meld.png   | Bin 2344 -> 0 bytes
 data/icons/hicolor/32x32/apps/org.gnome.meld.svg   | 843 -------------------
 data/icons/hicolor/48x48/apps/org.gnome.meld.png   | Bin 3571 -> 0 bytes
 .../icons/hicolor/scalable/apps/org.gnome.meld.svg | 919 ++++-----------------
 .../symbolic/apps/org.gnome.meld-symbolic.svg      |   3 +
 data/icons/org.gnome.meld.ico                      | Bin 17166 -> 17166 bytes
 14 files changed, 150 insertions(+), 1864 deletions(-)
---