JoelKatz 37fe9a6098 Merge branch 'master' into develop ...

Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
	modules/ripple_websocket/ripple_websocket.cpp
	src/cpp/ripple/NetworkOPs.cpp
	src/cpp/ripple/ripple_Application.cpp
	src/cpp/ripple/ripple_Peer.cpp

2013-07-07 15:28:18 -07:00

..

ripple_FieldNames.cpp

…

ripple_FieldNames.h

…

ripple_HashPrefix.h

…

ripple_LedgerFormat.cpp

…

ripple_LedgerFormat.h

…

ripple_PackedMessage.cpp

…

ripple_PackedMessage.h

…

ripple_Protocol.h

…

ripple_RippleAddress.cpp

…

ripple_RippleAddress.h

…

ripple_RippleAddressUnitTests.cpp

…

ripple_RippleSystem.h

…

ripple_SerializeDeclarations.h

…

ripple_SerializedObject.cpp

…

ripple_SerializedObject.h

…

ripple_SerializedObjectTemplate.cpp

…

ripple_SerializedObjectTemplate.h

…

ripple_SerializedObjectUnitTests.cpp

…

ripple_SerializedTypes.cpp

…

ripple_SerializedTypes.h

…

ripple_Serializer.cpp

…

ripple_Serializer.h

…

ripple_SerializerUnitTests.cpp

…

ripple_STAmount.cpp

…

ripple_STAmountRound.cpp

…

ripple_STAmountUnitTests.cpp

…

ripple_TER.cpp

…

ripple_TER.h

…

ripple_TxFlags.h

…

ripple_TxFormats.cpp

…

ripple_TxFormats.h

…