diff options
| author | Luke Dashjr <[email protected]> | 2012-11-17 09:06:06 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-17 09:06:06 +0000 |
| commit | cb44c07349175514c608a115ec3bf92c23296e19 (patch) | |
| tree | 58908bbe050353000cb2cfe1aafcf9064b8ba854 | |
| parent | Revert translation adjustments for NACK'd 0.7.2 changes. (diff) | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| download | discoin-cb44c07349175514c608a115ec3bf92c23296e19.tar.xz discoin-cb44c07349175514c608a115ec3bf92c23296e19.zip | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/main.cpp
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index b63d68187..3c5aa6312 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1484,7 +1484,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) } if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees)) - return error("ConnectBlock() : coinbase pays too much (actual=%lld vs limit=%lld)", (long long)vtx[0].GetValueOut(), (long long)GetBlockValue(pindex->nHeight, nFees)); + return error("ConnectBlock() : coinbase pays too much (actual=%"PRI64d" vs limit=%"PRI64d")", vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees)); if (fJustCheck) return true; |