[Pkg-bitcoin-commits] [electrum] 03/05: Merge tag 'upstream/2.5.2'

[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 c8fedd2bc215e5bb14bee81b1a403c33c0fd256a
Merge: 90052d4 95debb3
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Oct 29 02:23:57 2015 +0200

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2
    
    # gpg: Signature made Thu 29 Oct 2015 02:23:54 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 +-
 PKG-INFO                      |  2 +-
 RELEASE-NOTES                 |  6 +++
 electrum                      | 55 +++++++++++---------------
 gui/qt/address_dialog.py      | 27 +++----------
 gui/qt/history_widget.py      |  7 +++-
 gui/qt/icons_rc.py            |  2 +-
 gui/qt/installwizard.py       | 68 ++++++++++++--------------------
 gui/qt/main_window.py         |  3 +-
 gui/qt/network_dialog.py      | 15 ++++++--
 lib/commands.py               | 32 +++++++--------
 lib/interface.py              |  6 +--
 lib/tests/test_transaction.py | 55 --------------------------
 lib/transaction.py            |  9 ++++-
 lib/version.py                |  2 +-
 lib/wallet.py                 | 90 +++++++++++++++++++++++++++----------------
 lib/websockets.py             |  6 +--
 plugins/exchange_rate.py      |  5 ++-
 18 files changed, 167 insertions(+), 225 deletions(-)

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