Merge changes from master
This commit is contained in:
@@ -176,6 +176,8 @@ class MiniWindow(QDialog):
|
||||
|
||||
menubar = QMenuBar()
|
||||
electrum_menu = menubar.addMenu(_("&Bitcoin"))
|
||||
#electrum_menu.addMenu(_("&Servers"))
|
||||
#electrum_menu.addSeparator()
|
||||
electrum_menu.addAction(_("&Quit"))
|
||||
|
||||
view_menu = menubar.addMenu(_("&View"))
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
ELECTRUM_VERSION = "0.61"
|
||||
ELECTRUM_VERSION = "1.0"
|
||||
SEED_VERSION = 4 # bump this everytime the seed generation is modified
|
||||
TRANSLATION_ID = 28344 # version of the wiki page
|
||||
|
||||
Reference in New Issue
Block a user