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 d9f6e738a4bd2ffee744b2f7ecf77607c8defe1c
DIR parent f66763c37e7240014662f72ae021a8ca617cca54
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 18 Jan 2016 10:08:32 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/trezor/qt_generic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
t@@ -1,6 +1,5 @@
from functools import partial
import threading
-from PIL import Image
from PyQt4.Qt import Qt
from PyQt4.Qt import QGridLayout, QInputDialog, QPushButton
t@@ -360,6 +359,7 @@ class SettingsDialog(WindowModalDialog):
update()
def change_homescreen():
+ from PIL import Image # FIXME
dialog = QFileDialog(self, _("Choose Homescreen"))
filename = dialog.getOpenFileName()
if filename: