merge latest update

2019-10-31 20:31:39 +01:00
parent edfbbe2da9 0d5ea2f5a5
commit 8aab518775
12 changed files with 164 additions and 39 deletions
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -122,7 +122,7 @@ private:
    void importPrivKey();
    void exportAllKeys();
    void exportKeys(QString addr = "");
-    void backupWalletDat();
+    void exportSeed();
    void exportTransactions();

    void doImport(QList<QString>* keys);