[meld/meld-3-18: 4/4] Merge branch 'meld-3-18' into 'meld-3-18'

[Kai Willadsen <kaiw src gnome org>]

commit b1ff2409ba65f2f23855aa3191ff66e8a65d38e7
Merge: 22ee4744 b37a6f06
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu May 31 20:22:35 2018 +0000

    Merge branch 'meld-3-18' into 'meld-3-18'
    
    Meld 3 18 - fix two bugs specific to frozen meld on win32
    
    See merge request GNOME/meld!8

 bin/meld         | 11 ++++++-----
 meld/conf.py     | 14 +++++++-------
 meld/meldapp.py  |  2 +-
 meld/settings.py |  2 +-
 setup_win32.py   |  2 ++
 5 files changed, 17 insertions(+), 14 deletions(-)
---