[Pkg-bitcoin-commits] [electrum] 02/04: Merge tag 'upstream/2.6.4'

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 1fef78303fff379cfeab39e0571d28767df2eb7d
Merge: 914d24d 1947b68
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sun May 22 03:56:58 2016 +0200

    Merge tag 'upstream/2.6.4'
    
    Upstream version 2.6.4
    
    # gpg: Signature made Sun 22 May 2016 03:56:55 SAST
    # gpg:                using RSA key 0xC08990FB1F637893
    # gpg: Good signature from "Tristan Seligmann <mithrandi at mithrandi.net>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at debian.org>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at keybase.io>" [ultimate]
    # gpg: Signature notation: issuer-fpr at notations.openpgp.fifthhorseman.net=5C06568575516D0A33FFA7A3C08990FB1F637893
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600
    #      Subkey fingerprint: 5C06 5685 7551 6D0A 33FF  A7A3 C089 90FB 1F63 7893

 Electrum.egg-info/PKG-INFO               |   2 +-
 Electrum.egg-info/SOURCES.txt            |   1 +
 PKG-INFO                                 |   2 +-
 RELEASE-NOTES                            |   6 ++++++
 gui/kivy/uix/screens.py                  |   3 ++-
 gui/qt/history_widget.py                 |   1 +
 gui/qt/icons_rc.py                       |   2 +-
 gui/qt/installwizard.py                  |   1 +
 gui/qt/main_window.py                    |  11 ++++++-----
 lib/coinchooser.py                       |  18 +++++++++---------
 lib/commands.py                          |  10 ++++++++++
 lib/daemon.py                            |  28 ++++++++++++++--------------
 lib/locale/eo_UY/LC_MESSAGES/electrum.mo | Bin 32205 -> 2582 bytes
 lib/locale/it_IT/LC_MESSAGES/electrum.mo | Bin 33983 -> 34017 bytes
 lib/locale/pt_BR/LC_MESSAGES/electrum.mo | Bin 22165 -> 23793 bytes
 lib/locale/th_TH/LC_MESSAGES/electrum.mo | Bin 512 -> 512 bytes
 lib/transaction.py                       |   5 ++---
 lib/util.py                              |   2 ++
 lib/version.py                           |   2 +-
 lib/wl.py                                |  10 ++++++++++
 plugins/exchange_rate/qt.py              |  15 ++++++++++++---
 21 files changed, 80 insertions(+), 39 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git