Merge beast_basics to beast_core

This commit is contained in:
Vinnie Falco
2013-08-24 09:02:58 -07:00
parent 9ba8ea679c
commit 2bea9a8739
57 changed files with 609 additions and 663 deletions

View File

@@ -60,7 +60,6 @@ UI_HEADERS_DIR += ../../modules/ripple_basics
SOURCES += \
../../Subtrees/beast/modules/beast_asio/beast_asio.cpp \
../../Subtrees/beast/modules/beast_basics/beast_basics.cpp \
../../Subtrees/beast/modules/beast_boost/beast_boost.cpp \
../../Subtrees/beast/modules/beast_core/beast_core.cpp \
../../Subtrees/beast/modules/beast_crypto/beast_crypto.cpp \

View File

@@ -1020,7 +1020,6 @@
<ClCompile Include="..\..\modules\ripple_websocket\ripple_websocket.cpp" />
<ClCompile Include="..\..\src\cpp\protobuf_core.cpp" />
<ClCompile Include="..\..\Subtrees\beast\modules\beast_asio\beast_asio.cpp" />
<ClCompile Include="..\..\Subtrees\beast\modules\beast_basics\beast_basics.cpp" />
<ClCompile Include="..\..\Subtrees\beast\modules\beast_boost\beast_boost.cpp" />
<ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp" />
<ClCompile Include="..\..\Subtrees\beast\modules\beast_crypto\beast_crypto.cpp" />

View File

@@ -171,9 +171,6 @@
<ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
<Filter>[0] Subtrees\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\Subtrees\beast\modules\beast_basics\beast_basics.cpp">
<Filter>[0] Subtrees\beast</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\protobuf_core.cpp">
<Filter>[0] Subtrees\protobuf</Filter>
</ClCompile>