Merge branch 'master' of github.com:jedmccaleb/NewCoin into serialize

Conflicts:
	src/LedgerFormats.cpp
	src/SerializedLedger.cpp
	src/Version.h

Merge with master
This commit is contained in:
JoelKatz
2012-09-28 19:22:30 -07:00
9 changed files with 85 additions and 25 deletions

View File

@@ -81,9 +81,7 @@ LedgerEntryFormat LedgerFormats[]=
{ sfLedgerEntryType,SOE_REQUIRED },
{ sfFlags, SOE_REQUIRED },
{ sfBalance, SOE_REQUIRED },
{ sfLowID, SOE_REQUIRED },
{ sfLowLimit, SOE_REQUIRED },
{ sfHighID, SOE_REQUIRED },
{ sfHighLimit, SOE_REQUIRED },
{ sfLastTxnID, SOE_REQUIRED },
{ sfLastTxnSeq, SOE_REQUIRED },