From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 26 Apr 2012 22:37:12 +0000 (-0700)
Subject: Merge pull request #1151 from freewil/listsinceblock-blockhash
X-Git-Tag: v0.4.0-unstable~129^2~41
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=dfead66eacbaa5fa2921694c1a2e77835d1191fc;hp=-c

Merge pull request #1151 from freewil/listsinceblock-blockhash

listsinceblock: rpc param blockid -> blockhash
---

dfead66eacbaa5fa2921694c1a2e77835d1191fc
diff --combined src/bitcoinrpc.cpp
index bafd00c,2e991aa..15bcf1d
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@@ -1403,8 -1403,8 +1403,8 @@@ Value listsinceblock(const Array& param
  {
      if (fHelp)
          throw runtime_error(
-             "listsinceblock [blockid] [target-confirmations]\n"
-             "Get all transactions in blocks since block [blockid], or all transactions if omitted");
+             "listsinceblock [blockhash] [target-confirmations]\n"
+             "Get all transactions in blocks since block [blockhash], or all transactions if omitted");
  
      CBlockIndex *pindex = NULL;
      int target_confirms = 1;
@@@ -1441,6 -1441,7 +1441,6 @@@
  
      if (target_confirms == 1)
      {
 -        printf("oops!\n");
          lastblock = hashBestChain;
      }
      else