[meld/flatpak-ci: 23/31] Merge branch 'master' into flatpak-ci

[Kai Willadsen <kaiw src gnome org>]

commit 41d0ae2a491d67177157c5045cb9445529bdc4c8
Merge: a3a345d4 a0740385
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Nov 16 07:43:17 2019 +1000

    Merge branch 'master' into flatpak-ci
    
    This merge brings in the CSS resource move, which is handy for us here.

 MANIFEST.in                               |    3 +-
 bin/meld                                  |    8 +-
 data/meson.build                          |    8 -
 data/styles/meld-base.style-scheme.xml.in |    1 +
 data/styles/meld-dark.style-scheme.xml.in |    1 +
 help/es/es.po                             | 3055 ++++++++++++++---------------
 meld/const.py                             |    5 +
 meld/filediff.py                          |  104 +-
 meld/filemerge.py                         |   46 -
 meld/meldwindow.py                        |   10 +-
 meld/meson.build                          |    1 -
 {data => meld/resources}/meld.css         |    0
 meld/resources/meld.gresource.xml         |    1 +
 meld/resources/meson.build                |    1 -
 meld/sourceview.py                        |   39 +-
 meld/style.py                             |    3 +-
 po/POTFILES.in                            |    1 -
 setup.py                                  |    3 -
 setup_win32.py                            |    3 -
 19 files changed, 1617 insertions(+), 1676 deletions(-)
---