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
This commit is contained in:
Vinnie Falco
2013-08-19 14:30:27 -07:00

View File

@@ -12,7 +12,7 @@ char const* BuildInfo::getRawVersionString ()
// //
// The build version number (edit this for each release) // The build version number (edit this for each release)
// //
"0.12.0-rc3b" "0.12.0-rc4"
// //
// Must follow the format described here: // Must follow the format described here:
// //