Merge branch 'feature-beast' into feature-cleanup

Conflicts:
	RippleD.props
	newcoin.vcxproj.filters
	src/cpp/ripple/Application.cpp
	src/cpp/ripple/Application.h
This commit is contained in:
Vinnie Falco
2013-06-02 09:16:49 -07:00
18 changed files with 557 additions and 95 deletions

View File

@@ -122,6 +122,7 @@ namespace boost {
#include <openssl/ripemd.h> // For HashUtilities
#include <openssl/sha.h> // For HashUtilities
#include "modules/beast_core/beast_core.h"
#include "../ripple_json/ripple_json.h"