tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit da91a395b16657418a6bff70e35eb0dfb2975057
DIR parent 04b9d8fffa3f9b92ff9eb9d9b7ed6ec69396f2cb
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 3 Sep 2015 15:12:41 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/main_window.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -2259,7 +2259,7 @@ class ElectrumWindow(QMainWindow):
text = text_dialog(self, _('Input raw transaction'), _("Transaction:"), _("Load transaction"))
if not text:
return
- tx = self.tx_from_text()
+ tx = self.tx_from_text(text)
if tx:
self.show_transaction(tx)