diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 10:57:15 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 10:57:15 -0400 |
| commit | 8ba4282c3fd6dd26aa4956e5bc4a38c603625870 (patch) | |
| tree | 4d49a2b3a847ba8ef94ec2ae3cd5d0596ca04803 /src/bitcoinrpc.cpp | |
| parent | ea22a380de824500644db6fd6f33d0465b34f7a1 (diff) | |
| parent | e5f43fe30992abd75b6f981fd287cfed64c627ee (diff) | |
| download | bitcoin-8ba4282c3fd6dd26aa4956e5bc4a38c603625870.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index b80708dab4..6bb5fd0954 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1404,8 +1404,8 @@ Value listsinceblock(const Array& params, bool fHelp) { 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; @@ -1442,7 +1442,6 @@ Value listsinceblock(const Array& params, bool fHelp) if (target_confirms == 1) { - printf("oops!\n"); lastblock = hashBestChain; } else |