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

..

Ripple.sln

Fix out-of-date bug by recreating VS2012 project

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

RippleD.props

Update VS2012 Release build settings for VTune

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

RippleD.vcxproj

Break ripple_app module into 8 pieces (from 4)

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

RippleD.vcxproj.filters

Merge branch 'master' into develop

2013-07-07 15:28:18 -07:00