Vinnie Falco 097a8ce640 Merge branch 'release' into develop ...

Conflicts:
	Builds/VisualStudio2013/RippleD.vcxproj
	Builds/VisualStudio2013/RippleD.vcxproj.filters
	Builds/rpm/rippled.spec
	src/ripple/app/misc/NetworkOPs.cpp
	src/ripple/app/tx/impl/TransactionEngine.cpp
	src/ripple/protocol/impl/BuildInfo.cpp
	src/ripple/unity/app_tx.cpp

2015-07-07 09:35:41 -07:00

..

ConsensusImp.cpp

Refactor consensus:

2015-06-26 20:02:45 -07:00

ConsensusImp.h

Refactor consensus:

2015-06-26 20:02:45 -07:00

DisputedTx.cpp

Consensus cleanup:

2015-05-29 13:44:44 -04:00

DisputedTx.h

Refactor consensus:

2015-06-26 20:02:45 -07:00

InboundLedger.cpp

Tidy up locks and locals.

2015-06-25 11:17:09 -07:00

InboundLedgers.cpp

Merge branch 'release' into develop

2015-07-07 09:35:41 -07:00

LedgerCleaner.cpp

Acquire logic fixes:

2015-06-10 15:52:48 -07:00

LedgerCleaner.h

Consensus cleanup:

2015-05-29 13:44:44 -04:00

LedgerConsensusImp.cpp

Replace Serializer with Blob in SHAMapItem:

2015-07-02 15:06:09 -07:00

LedgerConsensusImp.h

Add enableTesting flag to applyTransactions

2015-06-30 11:33:45 -07:00

LedgerMaster.cpp

Refactor View, MetaView, and tx processing:

2015-06-30 19:26:02 -07:00

LedgerTiming.cpp

Refactor consensus:

2015-06-26 20:02:45 -07:00

MetaView.cpp

Add BasicView::txs memberspace interface

2015-07-02 15:09:10 -07:00

TxMeta.cpp

Refactor View, MetaView, and tx processing:

2015-06-30 19:26:02 -07:00