Merge remote-tracking branch 'zcash/master' into rebase

# Conflicts: # README.md # src/Makefile.gtest.include # src/chainparams.cpp # src/init.cpp # src/miner.cpp # src/wallet/wallet.cpp
2016-12-12 12:19:13 +02:00
parent 132aea8c60 9f7bc6cba5
commit bc17ac4928
94 changed files with 3461 additions and 808 deletions
--- a/src/rpcclient.cpp
+++ b/src/rpcclient.cpp
@@ -103,6 +103,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
    { "z_gettotalbalance", 0},
    { "z_sendmany", 1},
    { "z_sendmany", 2},
+    { "z_sendmany", 3},
    { "z_getoperationstatus", 0},
    { "z_getoperationresult", 0},
    { "z_importkey", 1 },