Merge branch 'listimmature' of /Users/gavin/src/gavin_btc

This commit is contained in:
Gavin Andresen
2011-04-12 17:31:31 -04:00
3 changed files with 31 additions and 21 deletions

2
main.h
View File

@@ -994,7 +994,7 @@ public:
return nChangeCached;
}
void GetAmounts(int64& nGenerated, list<pair<string /* address */, int64> >& listReceived,
void GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, list<pair<string /* address */, int64> >& listReceived,
list<pair<string /* address */, int64> >& listSent, int64& nFee, string& strSentAccount) const;
void GetAccountAmounts(const string& strAccount, int64& nGenerated, int64& nReceived,