Merge branch 'master' into ripple

This commit is contained in:
Arthur Britto
2012-09-04 16:16:13 -07:00
44 changed files with 483 additions and 396 deletions

View File

@@ -3155,7 +3155,7 @@ TER PathState::pushNode(int iType, uint160 uAccountID, uint160 uCurrencyID, uint
}
PathState::PathState(
const Ledger::pointer& lpLedger,
Ledger::ref lpLedger,
const int iIndex,
const LedgerEntrySet& lesSource,
const STPath& spSourcePath,