commit c1609d0ca7bd442efa2111d1d4b7e2269c172b62
parent 467b0c09730241b8aa9e2fc3342a90b991d62f3c
Author: Neil Booth <kyuupichan@gmail.com>
Date: Sun, 28 Feb 2016 19:10:51 +0900
Merge branch 'master' of github.com:spesmilo/electrum
Diffstat:
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/README.rst b/README.rst
@@ -37,11 +37,6 @@ If you don't have pip, install with::
-To start Electrum from your web browser, see
-http://electrum.org/bitcoin_URIs.html
-
-
-
2. HOW OFFICIAL PACKAGES ARE CREATED
------------------------------------
diff --git a/contrib/make_download b/contrib/make_download
@@ -49,15 +49,3 @@ with open(download_page,'w') as f:
f.write(string)
-# android
-
-from versions import android_template, android_page
-with open(android_template) as f:
- string = f.read()
-
-e4a_zipname = "e4a-%s.zip"%version
-string = string.replace("##VERSION##", version)
-string = string.replace("##ZIPNAME##", e4a_zipname)
-
-with open(android_page,'w') as f:
- f.write(string)
diff --git a/lib/commands.py b/lib/commands.py
@@ -233,7 +233,7 @@ class Commands:
def broadcast(self, tx, timeout=10):
"""Broadcast a transaction to the network. """
t = Transaction(tx)
- return self.network.broadcast(str(t), timeout)
+ return self.network.broadcast(t, timeout)
@command('')
def createmultisig(self, num, pubkeys):
