[ghex: 2/2] Merge branch 'unify-app-id' into 'master'

[Kalev Lember <klember src gnome org>]

commit 727ad23859458a6b3aad6297a8b7d2d21d2d8864
Merge: 38a374b c0e4668
Author: Kalev Lember <kalevlember gmail com>
Date:   Tue Dec 11 10:20:15 2018 +0000

    Merge branch 'unify-app-id' into 'master'
    
    make the app-id consistent
    
    See merge request GNOME/ghex!5

 data/meson.build                                            |   8 ++++----
 data/{ghex.appdata.xml.in => org.gnome.GHex.appdata.xml.in} |  11 ++++++++++-
 data/{ghex.desktop.in => org.gnome.GHex.desktop.in}         |   2 +-
 icons/hicolor/16x16/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/22x22/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/24x24/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/256x256/apps/{ghex.png => org.gnome.GHex.png} | Bin
 icons/hicolor/32x32/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/48x48/apps/{ghex.png => org.gnome.GHex.png}   | Bin
 icons/hicolor/512x512/apps/{ghex.png => org.gnome.GHex.png} | Bin
 .../apps/{ghex-symbolic.svg => org.gnome.GHex-symbolic.svg} |   0
 po/POTFILES.in                                              |   4 ++--
 src/ghex.gresource.xml                                      |   4 ++--
 src/main.c                                                  |   4 ++--
 src/ui.c                                                    |   2 +-
 15 files changed, 22 insertions(+), 13 deletions(-)
---