[meld: 2/2] Merge branch 'rename-appid' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit bb17325929baaf47bbc4042c4913df671702a6ef
Merge: 1c8c2310 4c86e9e8
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri May 25 23:12:03 2018 +0000

    Merge branch 'rename-appid' into 'master'
    
    Rename appid
    
    See merge request GNOME/meld!4

 MANIFEST.in                                                 |   6 +++---
 .../scalable/apps/{meld.svg => org.gnome.meld.svg}          |   0
 data/icons/Makefile                                         |   4 ++--
 .../hicolor/16x16/apps/{meld.png => org.gnome.meld.png}     | Bin
 .../hicolor/22x22/apps/{meld.png => org.gnome.meld.png}     | Bin
 .../hicolor/32x32/apps/{meld.png => org.gnome.meld.png}     | Bin
 .../hicolor/32x32/apps/{meld.svg => org.gnome.meld.svg}     |   0
 .../hicolor/48x48/apps/{meld.png => org.gnome.meld.png}     | Bin
 .../hicolor/scalable/apps/{meld.svg => org.gnome.meld.svg}  |   0
 data/icons/{meld.ico => org.gnome.meld.ico}                 | Bin
 data/mime/{meld.xml.in => org.gnome.meld.xml.in}            |   2 +-
 data/org.gnome.meld-devel.json                              |   3 ---
 data/{meld.appdata.xml.in => org.gnome.meld.appdata.xml.in} |   2 +-
 data/{meld.desktop.in => org.gnome.meld.desktop.in}         |   2 +-
 data/ui/application.ui                                      |   4 ++--
 data/ui/meldapp.ui                                          |   2 +-
 po/POTFILES.in                                              |   6 +++---
 17 files changed, 14 insertions(+), 17 deletions(-)
---