Merge branch 'release' into develop

This commit is contained in:
Vinnie Falco
2014-09-13 11:23:02 -07:00
2 changed files with 5 additions and 0 deletions

View File

@@ -159,6 +159,8 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\asio\socket_wrapper.h">
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\asio\ssl.h">
</ClInclude>
<ClCompile Include="..\..\src\beast\beast\asio\tests\bind_handler.test.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>

View File

@@ -711,6 +711,9 @@
<ClInclude Include="..\..\src\beast\beast\asio\socket_wrapper.h">
<Filter>beast\asio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\asio\ssl.h">
<Filter>beast\asio</Filter>
</ClInclude>
<ClCompile Include="..\..\src\beast\beast\asio\tests\bind_handler.test.cpp">
<Filter>beast\asio\tests</Filter>
</ClCompile>