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 |
|
JoelKatz
|
fca9a4abe4
|
Fix some possible cases where a node could be marked as full below when it shouldn't be.
|
2013-07-07 15:11:34 -07:00 |
|
JoelKatz
|
dc08a9061e
|
Fix some possible cases where a node could be marked as full below when it shouldn't be.
|
2013-07-06 12:35:18 -07:00 |
|
JoelKatz
|
be68458aff
|
Some cleanups.
|
2013-07-05 03:34:24 -07:00 |
|
Vinnie Falco
|
b52bbccd8a
|
Streamline Log with print() and out()
|
2013-07-01 09:32:09 -07:00 |
|
Vinnie Falco
|
c35c52ff08
|
Fix platform and debug macros
|
2013-07-01 09:32:08 -07:00 |
|
Vinnie Falco
|
2abec05b5b
|
Replace InstanceCounter with CountedObject
|
2013-06-19 16:23:03 -07:00 |
|
Vinnie Falco
|
00a7cbf610
|
Update copyright notice and 80 column separators
|
2013-06-15 18:20:59 -07:00 |
|
Vinnie Falco
|
8aab3645cb
|
Tidy up TxFormat and create TxFormats, TxFlags
|
2013-06-15 18:20:58 -07:00 |
|
Vinnie Falco
|
521e812fc4
|
Reformatting using AStyle
|
2013-06-14 08:45:13 -07:00 |
|
JoelKatz
|
5e0a1b23b5
|
Correctly handle emptying an inner node.
|
2013-06-10 21:40:49 -07:00 |
|
Vinnie Falco
|
3273625f61
|
Split up InfoSub and tidy up various files
|
2013-06-09 11:26:18 -07:00 |
|