Merge branch 'listaddresses' into integration

This commit is contained in:
Gavin Andresen 2011-01-06 08:56:10 -05:00
commit 009d5fb41f
1 changed files with 1 additions and 0 deletions

View File

@ -927,6 +927,7 @@ void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Ar
Object entry;
entry.push_back(Pair("account", acentry.strAccount));
entry.push_back(Pair("category", "move"));
entry.push_back(Pair("time", (boost::int64_t)acentry.nTime));
entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit)));
entry.push_back(Pair("otheraccount", acentry.strOtherAccount));
entry.push_back(Pair("comment", acentry.strComment));