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 c8328ee5fcf783dec496532f3a87b07c5ce15aac
DIR parent 3000762eac226be289bac3ef1b5ba71570d008c0
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 3 Oct 2013 07:27:51 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M app.fil | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
---
DIR diff --git a/app.fil b/app.fil
t@@ -1,15 +1,15 @@
-gui/gui_gtk.py
-gui/gui_classic/main_window.py
-gui/gui_classic/lite_window.py
-gui/gui_classic/history_widget.py
-gui/gui_classic/installwizard.py
-gui/gui_classic/network_dialog.py
-gui/gui_classic/password_dialog.py
-gui/gui_classic/qt_util.py
-gui/gui_classic/receiving_widget.py
-gui/gui_classic/seed_dialog.py
-gui/gui_classic/transaction_dialog.py
-gui/gui_classic/version_getter.py
+gui/gtk.py
+gui/qt/main_window.py
+gui/qt/lite_window.py
+gui/qt/history_widget.py
+gui/qt/installwizard.py
+gui/qt/network_dialog.py
+gui/qt/password_dialog.py
+gui/qt/util.py
+gui/qt/receiving_widget.py
+gui/qt/seed_dialog.py
+gui/qt/transaction_dialog.py
+gui/qt/version_getter.py
plugins/aliases.py
plugins/pointofsale.py
plugins/labels.py