|
|
|
@ -2273,10 +2273,6 @@ int64_t CWalletTx::GetTxTime() const |
|
|
|
return n ? n : nTimeReceived; |
|
|
|
} |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
======= |
|
|
|
>>>>>>> origin/dev |
|
|
|
// GetAmounts will determine the transparent debits and credits for a given wallet tx.
|
|
|
|
void CWalletTx::GetAmounts(list<COutputEntry>& listReceived, |
|
|
|
list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const |
|
|
|
|
