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

..

basics

Set version to 0.12.0-rc4

2013-08-19 14:20:18 -07:00

boost

Tidy up move obsolete and deprecated files

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

consensus

Fix a bug that could cause us not to acquire the current ledger.

2013-08-19 14:05:28 -07:00

contracts

Use accessor function for theConfig

2013-07-24 11:51:38 -07:00

data

Fix SqliteDatabase to start the thread

2013-07-30 13:27:06 -07:00

ledger

Don't touch a possibly-failed inbound ledger.

2013-08-19 14:07:47 -07:00

main

Begin replacing old logic with new.

2013-08-14 15:45:47 -07:00

misc

Typo.

2013-08-19 14:04:12 -07:00

network

Import ProxyHandshake into beast

2013-08-15 15:45:14 -07:00

node

Better reporting for missing [node_db]

2013-08-09 14:24:24 -07:00

paths

Offer fix rollup:

2013-08-06 09:41:48 -07:00

peers

Make the progress logic that triggers timeouts smarter.

2013-08-19 14:06:40 -07:00

rpc

Make doTransactionEntry work against an open ledger.

2013-08-15 11:38:42 -07:00

shamap

Make getNodeFat return long skinny strings when needed. Optimizations.

2013-08-14 15:45:49 -07:00

tx

Offer fix rollup:

2013-08-06 09:41:48 -07:00

ripple_app_pt1.cpp

Rename module ripple_main to ripple_app

2013-06-17 09:46:38 -07:00

ripple_app_pt2.cpp

Rename module ripple_main to ripple_app

2013-06-17 09:46:38 -07:00

ripple_app_pt3.cpp

Rename module ripple_main to ripple_app

2013-06-17 09:46:38 -07:00

ripple_app_pt4.cpp

Rename module ripple_main to ripple_app

2013-06-17 09:46:38 -07:00

ripple_app_pt5.cpp

Break ripple_app module into 8 pieces (from 4)

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

ripple_app_pt6.cpp

Break ripple_app module into 8 pieces (from 4)

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

ripple_app_pt7.cpp

Break ripple_app module into 8 pieces (from 4)

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

ripple_app_pt8.cpp

Break ripple_app module into 8 pieces (from 4)

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

ripple_app.cpp

Tidy up move obsolete and deprecated files

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

ripple_app.h

Tidy up move obsolete and deprecated files

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