set conf 2, merge upstream update

2019-10-31 17:23:44 +01:00
parent 0590d14693 3d66568ceb
commit edfbbe2da9
16 changed files with 521 additions and 56 deletions
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -96,6 +96,9 @@ private:
    Tx   createTxFromSendPage();
    bool confirmTx(Tx tx, RecurringPaymentInfo* rpi);

+    void encryptWallet();
+    void removeWalletEncryption();
+
    void cancelButton();
    void sendButton();
    void addAddressSection();