[gnote/meson: 2/4] Merge branch 'master' into meson

[Aurimas Černius <aurimasc src gnome org>]

commit d416ca852ae340ffb6a2367809646ed13a0d4380
Merge: 3501756a 75950383
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Thu Apr 1 23:04:12 2021 +0300

    Merge branch 'master' into meson

 .gitignore                                            |   2 +-
 configure.ac                                          |   2 +-
 data/Makefile.am                                      |   2 +-
 data/icons/Makefile.am                                |  18 +++++++++---------
 ...ote.png => hicolor_apps_16x16_org.gnome.Gnote.png} | Bin
 ...bz2 => hicolor_apps_16x16_org.gnome.Gnote.xcf.bz2} | Bin
 ...ote.png => hicolor_apps_22x22_org.gnome.Gnote.png} | Bin
 ...bz2 => hicolor_apps_22x22_org.gnome.Gnote.xcf.bz2} | Bin
 ...ote.png => hicolor_apps_24x24_org.gnome.Gnote.png} | Bin
 ...e.png => hicolor_apps_256x256_org.gnome.Gnote.png} | Bin
 ...ote.png => hicolor_apps_32x32_org.gnome.Gnote.png} | Bin
 ...ote.png => hicolor_apps_48x48_org.gnome.Gnote.png} | Bin
 ....svg => hicolor_apps_scalable_org.gnome.Gnote.svg} |   0
 data/org.gnome.Gnote.desktop.in.in                    |  17 +++++++++++++++++
 14 files changed, 29 insertions(+), 12 deletions(-)
---