1
0

Merge changes from master

This commit is contained in:
Maran
2012-08-12 21:44:27 +02:00
3 changed files with 8 additions and 2 deletions

View File

@@ -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"))

View File

@@ -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