[meld/Python3: 53/54] Merge branch 'master' into Python3
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/Python3: 53/54] Merge branch 'master' into Python3
- Date: Sun, 1 May 2016 22:24:57 +0000 (UTC)
commit d7cbf4bf3336106089f30ea291f1bf87e7906086
Merge: 356ca38 778c8cc
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon May 2 08:14:53 2016 +1000
Merge branch 'master' into Python3
NEWS | 20 ++
data/ui/meldapp-ui.xml | 9 -
data/ui/meldapp.ui | 8 +-
meld/conf.py | 2 +-
meld/dirdiff.py | 3 +
meld/melddoc.py | 23 ++-
meld/meldwindow.py | 121 +---------
meld/misc.py | 33 +++-
meld/newdifftab.py | 9 +-
meld/ui/gladesupport.py | 1 +
meld/ui/notebook.py | 156 +++++++++++++
po/sv.po | 588 +++++++++++++++++++++++++++++++++--------------
setup_win32.py | 6 +-
13 files changed, 669 insertions(+), 310 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]