Merge branch '0.5.x' into 0.6.0.x

This commit is contained in:
Luke Dashjr
2012-05-06 05:35:58 +00:00
3 changed files with 9 additions and 7 deletions

View File

@@ -965,7 +965,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
//// debug print
//printf("LoadWallet %s\n", wtx.GetHash().ToString().c_str());
//printf(" %12I64d %s %s %s\n",
//printf(" %12"PRI64d" %s %s %s\n",
// wtx.vout[0].nValue,
// DateTimeStrFormat("%x %H:%M:%S", wtx.GetBlockTime()).c_str(),
// wtx.hashBlock.ToString().substr(0,20).c_str(),