From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 1 Jun 2016 11:41:19 +0000 (+0200)
Subject: Merge pull request #197 from inikep/dev070
X-Git-Tag: v0.7.0^2~49^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a0215b5392c7f864501ee5a936abb406f85839;p=thirdparty%2Fzstd.git

Merge pull request #197 from inikep/dev070

improved Travis tests, skippable frames
---

38a0215b5392c7f864501ee5a936abb406f85839
diff --cc projects/VS2010/fullbench/fullbench.vcxproj
index 150faa8d6,475765350..707a2d0b1
--- a/projects/VS2010/fullbench/fullbench.vcxproj
+++ b/projects/VS2010/fullbench/fullbench.vcxproj
@@@ -157,8 -157,8 +157,9 @@@
    </ItemDefinitionGroup>
    <ItemGroup>
      <ClCompile Include="..\..\..\lib\common\entropy_common.c" />
 +    <ClCompile Include="..\..\..\lib\common\xxhash.c" />
      <ClCompile Include="..\..\..\lib\common\zstd_common.c" />
+     <ClCompile Include="..\..\..\lib\common\xxhash.c" />
      <ClCompile Include="..\..\..\lib\common\fse_decompress.c" />
      <ClCompile Include="..\..\..\lib\compress\fse_compress.c" />
      <ClCompile Include="..\..\..\lib\compress\huf_compress.c" />