[meld: 2/2] Merge branch 'supercalls' into 'master'
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 2/2] Merge branch 'supercalls' into 'master'
- Date: Thu, 26 Jul 2018 21:19:27 +0000 (UTC)
commit 1dbc26361b515f34d1a2f0483cf12d28534bfb94
Merge: 8ef208ce 3a90da8d
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Jul 26 21:18:57 2018 +0000
Merge branch 'supercalls' into 'master'
Calling super() whenever possible
See merge request GNOME/meld!12
meld/build_helpers.py | 2 +-
meld/diffgrid.py | 2 +-
meld/diffmap.py | 2 +-
meld/dirdiff.py | 3 +--
meld/filemerge.py | 4 ++--
meld/matchers/diffutil.py | 2 +-
meld/matchers/merge.py | 7 +++----
meld/matchers/myers.py | 6 +++---
meld/meldapp.py | 4 ++--
meld/meldbuffer.py | 4 ++--
meld/melddoc.py | 2 +-
meld/meldwindow.py | 2 +-
meld/preferences.py | 14 +++++++-------
meld/settings.py | 2 +-
meld/tree.py | 3 +--
meld/ui/filechooser.py | 4 ++--
meld/ui/findbar.py | 4 ++--
meld/ui/listwidget.py | 3 +--
meld/ui/notebook.py | 2 +-
meld/ui/notebooklabel.py | 2 +-
meld/ui/statusbar.py | 2 +-
meld/ui/vcdialogs.py | 2 +-
meld/vcview.py | 2 +-
23 files changed, 38 insertions(+), 42 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]