Resolved merge conflict dev+zstdmt

This commit is contained in:
Yann Collet committed 2017-01-20 16:44:50 -08:00
commit d7e3cb58c5
35 files changed
+1834 -267

No files matched your search

+1
View File
@@ -32,6 +32,7 @@
<ClCompile Include="..\..\..\lib\compress\zstd_compress.c" />
<ClCompile Include="..\..\..\lib\decompress\huf_decompress.c" />
<ClCompile Include="..\..\..\lib\decompress\zstd_decompress.c" />
<ClCompile Include="..\..\..\lib\dictBuilder\cover.c" />
<ClCompile Include="..\..\..\lib\dictBuilder\divsufsort.c" />
<ClCompile Include="..\..\..\lib\dictBuilder\zdict.c" />
<ClCompile Include="..\..\..\lib\legacy\zstd_v01.c" />