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 9c016a94e27f0849785b725acedb898ed1d24b23
DIR parent 6197b8b8dc334f8301f40c19a61b5195df27e5ab
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 4 Nov 2013 12:43:02 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M contrib/build-wine/deterministic.s… | 4 ++--
M setup-release.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
t@@ -1,9 +1,9 @@
# -*- mode: python -*-
# We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis(['electrum', 'gui/gui_classic.py', 'gui/gui_lite.py', 'gui/gui_text.py',
+a = Analysis(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui/text.py',
'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py',
- 'lib/bitcoin.py', 'lib/deserialize.py'
+ 'lib/bitcoin.py'
],
hiddenimports=["lib","gui"],
pathex=['lib:gui:plugins'],
DIR diff --git a/setup-release.py b/setup-release.py
t@@ -35,7 +35,7 @@ if sys.platform == 'darwin':
includes = ['PyQt4.QtCore','PyQt4.QtGui', 'sip'],
packages = ['lib', 'gui', 'plugins'],
iconfile='electrum.icns',
- plist=plist,
+# plist=plist,
resources=["data", "icons"])),
)
elif sys.platform == 'win32':