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

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_FieldNames.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_HashPrefix.h

Tidy up LedgerEntrySet

2013-06-16 16:57:51 -07:00

ripple_LedgerFormat.cpp

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_LedgerFormat.h

Refactor TxFormats and fix leak on exit

2013-07-01 09:32:03 -07:00

ripple_PackedMessage.cpp

Streamline Log with print() and out()

2013-07-01 09:32:09 -07:00

ripple_PackedMessage.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_Protocol.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_RippleAddress.cpp

Streamline Log with print() and out()

2013-07-01 09:32:09 -07:00

ripple_RippleAddress.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_RippleAddressUnitTests.cpp

Put modules in ripple namespace

2013-06-27 13:41:20 -07:00

ripple_RippleSystem.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_SerializeDeclarations.h

Start moving to SetFlag/ClearFlag

2013-06-17 18:53:42 -07:00

ripple_SerializedObject.cpp

Merge branch 'master' into develop

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

ripple_SerializedObject.h

Use manual method for naming CountedObject classes

2013-06-26 01:10:54 -07:00

ripple_SerializedObjectTemplate.cpp

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_SerializedObjectTemplate.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_SerializedObjectUnitTests.cpp

Put modules in ripple namespace

2013-06-27 13:41:20 -07:00

ripple_SerializedTypes.cpp

Merge branch 'master' into develop

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

ripple_SerializedTypes.h

Merge branch 'master' into develop

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

ripple_Serializer.cpp

Split unit tests to separate files

2013-06-27 10:37:01 -07:00

ripple_Serializer.h

Update copyright notice and 80 column separators

2013-06-15 18:20:59 -07:00

ripple_SerializerUnitTests.cpp

Put modules in ripple namespace

2013-06-27 13:41:20 -07:00

ripple_STAmount.cpp

Streamline Log with print() and out()

2013-07-01 09:32:09 -07:00

ripple_STAmountRound.cpp

Split unit tests to separate files

2013-06-27 10:37:01 -07:00

ripple_STAmountUnitTests.cpp

Put modules in ripple namespace

2013-06-27 13:41:20 -07:00

ripple_TER.cpp

Add tecOWNERS.

2013-06-28 13:58:55 -07:00

ripple_TER.h

Add tecOWNERS.

2013-06-28 13:58:55 -07:00

ripple_TxFlags.h

Finish SetFlag/ClearFlag

2013-06-18 09:56:34 -07:00

ripple_TxFormats.cpp

Update some beast container code

2013-07-03 09:41:44 -07:00

ripple_TxFormats.h

Refactor TxFormats and fix leak on exit

2013-07-01 09:32:03 -07:00