Merge branch 'duke' into sietch_dynamic

2020-01-21 23:35:59 -05:00
parent d58e2473fc 4c39efccce
commit dc6d7dc0b2
7 changed files with 817 additions and 3 deletions
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -34,7 +34,7 @@
 // Must be kept in sync with configure.ac !
 #define CLIENT_VERSION_MAJOR 3
 #define CLIENT_VERSION_MINOR 3
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 50

 //! Set to true for release, false for prerelease or test build
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1529,7 +1529,6 @@ UniValue sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk)

        CRecipient recipient = {scriptPubKey, nAmount, fSubtractFeeFromAmount};
        vecSend.push_back(recipient);
-        i++;
    }

    EnsureWalletIsUnlocked();