AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge changes from master

Browse Source
This commit is contained in:
Maran
2012-08-12 21:44:27 +02:00
parent bc64b2ae09 c1abb8ea05
commit 21eeb7690c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@@ -3,7 +3,7 @@ Electrum - lightweight Bitcoin client
Licence: GNU GPL v3 Licence: GNU GPL v3
Author: thomasv@gitorious Author: thomasv@gitorious
Language: Python Language: Python
Homepage: http://ecdsa.org/electrum Homepage: http://electrum-desktop.com/
== INSTALL == == INSTALL ==
@@ -31,7 +31,11 @@ python setup.py sdist --format=zip,gztar
On Mac OS X: On Mac OS X:
# On port based installs
sudo python setup-release.py py2app sudo python setup-release.py py2app
# On brew installs
ARCHFLAGS="-arch i386 -arch x86_64" sudo /usr/bin/python setup-release.py py2app --includes sip
sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-v0.61-macosx.dmg sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-v0.61-macosx.dmg

2
lib/gui_lite.py
View File

@@ -176,6 +176,8 @@ class MiniWindow(QDialog):
menubar = QMenuBar() menubar = QMenuBar()
electrum_menu = menubar.addMenu(_("&Bitcoin")) electrum_menu = menubar.addMenu(_("&Bitcoin"))
#electrum_menu.addMenu(_("&Servers"))
#electrum_menu.addSeparator()
electrum_menu.addAction(_("&Quit")) electrum_menu.addAction(_("&Quit"))
view_menu = menubar.addMenu(_("&View")) view_menu = menubar.addMenu(_("&View"))

2
lib/version.py
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 SEED_VERSION = 4 # bump this everytime the seed generation is modified
TRANSLATION_ID = 28344 # version of the wiki page TRANSLATION_ID = 28344 # version of the wiki page