Merge commit 'c652cf066d0b43c7c5bc10b4d56ff99a867e7873' into develop

This commit is contained in:
Vinnie Falco
2017-02-02 09:05:28 -05:00
58 changed files with 3742 additions and 1680 deletions

View File

@@ -428,6 +428,8 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\mask.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\pmd_extension.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\stream_base.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\detail\utf8_checker.hpp">
@@ -464,6 +466,26 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket\teardown.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\deflate_stream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\detail\bitstream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\detail\deflate_stream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\detail\inflate_stream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\detail\ranges.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\detail\window.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\error.hpp">
</ClInclude>
<None Include="..\..\src\beast\include\beast\zlib\impl\error.ipp">
</None>
<ClInclude Include="..\..\src\beast\include\beast\zlib\inflate_stream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\zlib\zlib.hpp">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-32bit.h">
</ClInclude>
<ClInclude Include="..\..\src\ed25519-donna\curve25519-donna-64bit.h">