[Pkg-bitcoin-commits] [electrum] 02/24: Merge tag 'upstream/2.3.1'

Tristan Seligmann mithrandi at moszumanska.debian.org
Sun Aug 23 22:44:02 UTC 2015


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

mithrandi pushed a commit to branch master
in repository electrum.

commit 705a689fab4421900756a6198dde27efe241c91d
Merge: 41c3453 4f0709f
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Jun 13 14:23:35 2015 +0200

    Merge tag 'upstream/2.3.1'
    
    Upstream version 2.3.1
    
    # gpg: Signature made Sat 13 Jun 2015 14:23:25 SAST
    # gpg:                using RSA key 0x58C0FB1CDE3B7600
    # 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=DB24E315EDAAAC13D646709958C0FB1CDE3B7600
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600

 Electrum.egg-info/PKG-INFO                         |     2 +-
 Electrum.egg-info/SOURCES.txt                      |    39 +
 PKG-INFO                                           |     2 +-
 RELEASE-NOTES                                      |    37 +
 docs/Makefile                                      |   183 +
 docs/_build/doctrees/environment.pickle            |   Bin 0 -> 3970 bytes
 docs/_build/doctrees/index.doctree                 |   Bin 0 -> 5757 bytes
 docs/_build/html/.buildinfo                        |     4 +
 docs/_build/html/_sources/index.txt                |    29 +
 docs/_build/html/_static/ajax-loader.gif           |   Bin 0 -> 673 bytes
 docs/_build/html/_static/basic.css                 |   557 +
 .../_build/html/_static/comment-bright.png         |   Bin 3869 -> 3500 bytes
 .../_build/html/_static/comment-close.png          |   Bin 3869 -> 3578 bytes
 .../_build/html/_static/comment.png                |   Bin 3869 -> 3445 bytes
 docs/_build/html/_static/default.css               |   261 +
 docs/_build/html/_static/doctools.js               |   263 +
 docs/_build/html/_static/down-pressed.png          |   Bin 0 -> 347 bytes
 docs/_build/html/_static/down.png                  |   Bin 0 -> 347 bytes
 docs/_build/html/_static/file.png                  |   Bin 0 -> 358 bytes
 docs/_build/html/_static/jquery-1.11.1.js          | 10308 +++++++++++++++++++
 docs/_build/html/_static/jquery.js                 |     4 +
 docs/_build/html/_static/minus.png                 |   Bin 0 -> 173 bytes
 docs/_build/html/_static/plus.png                  |   Bin 0 -> 173 bytes
 docs/_build/html/_static/pygments.css              |    63 +
 docs/_build/html/_static/searchtools.js            |   622 ++
 docs/_build/html/_static/sidebar.js                |   159 +
 docs/_build/html/_static/underscore-1.3.1.js       |   999 ++
 docs/_build/html/_static/underscore.js             |    31 +
 docs/_build/html/_static/up-pressed.png            |   Bin 0 -> 345 bytes
 docs/_build/html/_static/up.png                    |   Bin 0 -> 345 bytes
 docs/_build/html/_static/websupport.js             |   808 ++
 docs/_build/html/genindex.html                     |    92 +
 docs/_build/html/index.html                        |   119 +
 docs/_build/html/objects.inv                       |   Bin 0 -> 204 bytes
 docs/_build/html/search.html                       |    99 +
 docs/_build/html/searchindex.js                    |     1 +
 docs/conf.py                                       |   277 +
 docs/index.rst                                     |    29 +
 docs/index.rst~                                    |    22 +
 docs/make.bat                                      |   263 +
 electrum                                           |   482 +-
 gui/android.py                                     |    23 +-
 gui/gtk.py                                         |    45 +-
 gui/jsonrpc.py                                     |    72 +
 gui/qt/__init__.py                                 |    12 +-
 gui/qt/amountedit.py                               |    10 +-
 gui/qt/history_widget.py                           |    18 +-
 gui/qt/history_widget_lite.py                      |     2 +-
 gui/qt/icons_rc.py                                 |   648 +-
 gui/qt/installwizard.py                            |    18 +-
 gui/qt/lite_window.py                              |     6 +-
 gui/qt/main_window.py                              |   385 +-
 gui/qt/network_dialog.py                           |    18 +-
 gui/qt/paytoedit.py                                |    18 +-
 gui/qt/qrcodewidget.py                             |     9 +-
 gui/qt/qrtextedit.py                               |    16 +-
 gui/qt/seed_dialog.py                              |     3 +-
 gui/qt/transaction_dialog.py                       |    22 +-
 gui/qt/util.py                                     |    40 +-
 gui/qt/version_getter.py                           |    14 +-
 gui/stdio.py                                       |    17 +-
 gui/text.py                                        |    31 +-
 icons/electrum_dark_icon.png                       |   Bin 3872 -> 1268 bytes
 icons/electrum_light_icon.png                      |   Bin 3869 -> 1268 bytes
 lib/bitcoin.py                                     |     1 +
 lib/blockchain.py                                  |    12 +-
 lib/commands.py                                    |   858 +-
 lib/daemon.py                                      |    24 +-
 lib/interface.py                                   |   194 +-
 lib/locale/ar_SA/LC_MESSAGES/electrum.mo           |   Bin 37295 -> 35480 bytes
 lib/locale/bg_BG/LC_MESSAGES/electrum.mo           |   Bin 45902 -> 43843 bytes
 lib/locale/cs_CZ/LC_MESSAGES/electrum.mo           |   Bin 35219 -> 33456 bytes
 lib/locale/da_DK/LC_MESSAGES/electrum.mo           |   Bin 35021 -> 33429 bytes
 lib/locale/de_DE/LC_MESSAGES/electrum.mo           |   Bin 35872 -> 34080 bytes
 lib/locale/el_GR/LC_MESSAGES/electrum.mo           |   Bin 33928 -> 32196 bytes
 lib/locale/eo_UY/LC_MESSAGES/electrum.mo           |   Bin 33937 -> 32205 bytes
 lib/locale/es_ES/LC_MESSAGES/electrum.mo           |   Bin 35953 -> 34274 bytes
 lib/locale/fr_FR/LC_MESSAGES/electrum.mo           |   Bin 36988 -> 35304 bytes
 lib/locale/hu_HU/LC_MESSAGES/electrum.mo           |   Bin 34673 -> 33049 bytes
 lib/locale/hy_AM/LC_MESSAGES/electrum.mo           |   Bin 33945 -> 32213 bytes
 lib/locale/id_ID/LC_MESSAGES/electrum.mo           |   Bin 35016 -> 33232 bytes
 lib/locale/it_IT/LC_MESSAGES/electrum.mo           |   Bin 35689 -> 34023 bytes
 lib/locale/ja_JP/LC_MESSAGES/electrum.mo           |   Bin 39441 -> 37578 bytes
 lib/locale/ky_KG/LC_MESSAGES/electrum.mo           |   Bin 34620 -> 32888 bytes
 lib/locale/lv_LV/LC_MESSAGES/electrum.mo           |   Bin 35569 -> 33929 bytes
 lib/locale/nb_NO/LC_MESSAGES/electrum.mo           |   Bin 34049 -> 32326 bytes
 lib/locale/nl_NL/LC_MESSAGES/electrum.mo           |   Bin 35425 -> 33630 bytes
 lib/locale/pl_PL/LC_MESSAGES/electrum.mo           |   Bin 34858 -> 33103 bytes
 lib/locale/pt_BR/LC_MESSAGES/electrum.mo           |   Bin 34418 -> 32674 bytes
 lib/locale/pt_PT/LC_MESSAGES/electrum.mo           |   Bin 35965 -> 34170 bytes
 lib/locale/ro_RO/LC_MESSAGES/electrum.mo           |   Bin 33958 -> 32226 bytes
 lib/locale/ru_RU/LC_MESSAGES/electrum.mo           |   Bin 43565 -> 43891 bytes
 lib/locale/sk_SK/LC_MESSAGES/electrum.mo           |   Bin 35500 -> 33727 bytes
 lib/locale/sl_SI/LC_MESSAGES/electrum.mo           |   Bin 33907 -> 32175 bytes
 lib/locale/ta_IN/LC_MESSAGES/electrum.mo           |   Bin 35200 -> 33468 bytes
 lib/locale/th_TH/LC_MESSAGES/electrum.mo           |   Bin 33920 -> 32188 bytes
 lib/locale/vi_VN/LC_MESSAGES/electrum.mo           |   Bin 34191 -> 32459 bytes
 lib/locale/zh_CN/LC_MESSAGES/electrum.mo           |   Bin 32913 -> 31178 bytes
 lib/network.py                                     |   455 +-
 lib/network_proxy.py                               |    17 +-
 lib/paymentrequest.py                              |    40 +-
 lib/plugins.py                                     |   119 +-
 lib/simple_config.py                               |   132 +-
 lib/synchronizer.py                                |     2 +-
 lib/tests/test_simple_config.py                    |    42 +-
 lib/tests/test_wallet.py                           |    59 +-
 lib/transaction.py                                 |    16 +-
 lib/util.py                                        |   105 +-
 lib/verifier.py                                    |    97 +-
 lib/version.py                                     |     2 +-
 lib/wallet.py                                      |   504 +-
 lib/www/index.html                                 |    81 +
 lib/x509.py                                        |    85 +-
 packages/requests/cacert.pem                       |  1930 ++--
 plugins/__init__.py                                |   114 +-
 plugins/audio_modem.py                             |     7 -
 plugins/btchipwallet.py                            |    27 +-
 plugins/cosigner_pool.py                           |    16 +-
 plugins/exchange_rate.py                           |   380 +-
 plugins/greenaddress_instant.py                    |    18 +-
 plugins/labels.py                                  |    12 +-
 plugins/openalias.py                               |    58 +-
 plugins/plot.py                                    |     7 -
 plugins/trezor.py                                  |    64 +-
 plugins/trustedcoin.py                             |    25 +-
 plugins/virtualkeyboard.py                         |     6 -
 scripts/authenticator.py                           |     2 +-
 scripts/check_hist                                 |     2 +-
 scripts/{check_hist => check_hist~}                |     0
 scripts/merchant/merchant.py                       |     2 +-
 scripts/servers                                    |     6 +-
 scripts/util.py                                    |    12 +-
 scripts/util.pyc                                   |   Bin 2193 -> 2207 bytes
 setup.py                                           |     1 +
 test.py                                            |    23 +-
 135 files changed, 19417 insertions(+), 3322 deletions(-)

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



More information about the Pkg-bitcoin-commits mailing list