tFix merge conflicts - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 39660eeac51391a4be673a57db6382a3ee203dcd
DIR parent 95d8adb8fcd4e5f9b3876be053ce0f780646a4b3
HTML Author: Maran <maran.hidskes@gmail.com>
Date: Thu, 16 Aug 2012 23:36:41 +0200
Fix merge conflicts
Diffstat:
M lib/gui_lite.py | 4 +---
M setup.py | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/gui_lite.py b/lib/gui_lite.py
t@@ -189,6 +189,7 @@ class MiniWindow(QDialog):
electrum_menu.addSeparator()
brain_seed = electrum_menu.addAction(_("&BrainWallet Info"))
brain_seed.triggered.connect(self.actuator.show_seed_dialog)
+
electrum_menu.addAction(_("&Quit"))
view_menu = menubar.addMenu(_("&View"))
t@@ -200,9 +201,6 @@ class MiniWindow(QDialog):
show_history.setCheckable(True)
show_history.toggled.connect(self.show_history)
- settings_menu = menubar.addMenu(_("&Settings"))
- settings_menu.addAction(_("&Configure Electrum"))
-
help_menu = menubar.addMenu(_("&Help"))
the_website = help_menu.addAction(_("&Website"))
the_website.triggered.connect(self.the_website)
DIR diff --git a/setup.py b/setup.py
t@@ -51,6 +51,7 @@ setup(name = "Electrum",
'electrum.mnemonic',
'electrum.pyqrnative',
'electrum.qrscanner',
+ 'electrum.history_widget',
'electrum.bmp',
'electrum.msqr',
'electrum.util',