inikep a6b942018d Merge remote-tracking branch 'refs/remotes/origin/dev' into dev070 ... # Conflicts: # .travis.yml # Makefile # lib/common/zstd_static.h # programs/Makefile # projects/VS2008/zstd/zstd.vcproj # projects/VS2008/zstdlib/zstdlib.vcproj # projects/cmake/lib/CMakeLists.txt # projects/cmake/programs/CMakeLists.txt		2016-06-01 00:07:09 +02:00
..
.gitignore	fixed cmake	2016-05-29 02:02:24 +02:00
CMakeLists.txt	Merge remote-tracking branch 'refs/remotes/origin/dev' into dev070	2016-06-01 00:07:09 +02:00