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

Conflicts:
	src/TransactionFormats.cpp

Fast forward.
This commit is contained in:
JoelKatz
2012-09-30 22:38:31 -07:00
8 changed files with 36 additions and 53 deletions

View File

@@ -55,7 +55,7 @@ std::string SerializedLedgerEntry::getFullText() const
std::string SerializedLedgerEntry::getText() const
{
return str(boost::format("{ %s, %s, %s }")
return str(boost::format("{ %s, %s }")
% mIndex.GetHex()
% STObject::getText());
}