Vinnie Falco 02412b2ba4 Merge branch 'release' into develop ...

Conflicts:
	Subtrees/beast/modules/beast_asio/protocol/beast_HandshakeDetectorType.h
	modules/ripple_app/basics/ripple_BuildInfo.cpp
	modules/ripple_app/ledger/LedgerMaster.cpp

2013-08-19 14:30:27 -07:00

..

ripple_app

Merge branch 'release' into develop

2013-08-19 14:30:27 -07:00

ripple_asio

Clean up combinations of buffered handshaking and future returns

2013-08-18 03:20:57 -07:00

ripple_basics

Revert "Fix unique_ptr availability"

2013-08-07 19:25:26 -07:00

ripple_client

Full Refactor of LoadManager

2013-06-24 15:52:01 -07:00

ripple_core

Fix gcc compile error

2013-08-15 08:26:50 -07:00

ripple_data

Add 'hostid' to server_info

2013-07-31 08:56:21 -07:00

ripple_hyperleveldb

Disable some gcc warnings

2013-08-01 15:34:04 -07:00

ripple_json

Add 'hostid' to server_info

2013-07-31 08:56:21 -07:00

ripple_leveldb

Uniform include of BeastConfig.h

2013-06-28 17:01:03 -07:00

ripple_mdb

Disable some gcc warnings

2013-08-01 15:34:04 -07:00

ripple_net

Tidy up move obsolete and deprecated files

2013-08-17 21:09:53 -07:00

ripple_websocket

Fix gcc compile

2013-08-17 21:09:59 -07:00