]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev070
authorinikep <inikep@gmail.com>
Tue, 31 May 2016 22:07:09 +0000 (00:07 +0200)
committerinikep <inikep@gmail.com>
Tue, 31 May 2016 22:07:09 +0000 (00:07 +0200)
commita6b942018d17207e256dd55ba1c57f89ced3b830
tree673604b7fab711da396b2f6a7071e25425fddada
parent5d500b60e7eb63106dcf8e1848c1d396f320a9d3
parentcf6edcd0a13fd7f2dc85384e3883886535960d23
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
16 files changed:
.travis.yml
Makefile
lib/common/zstd_internal.h
lib/common/zstd_static.h
lib/decompress/zstd_decompress.c
programs/Makefile
programs/fileio.c
programs/playTests.sh
programs/zbufftest.c
programs/zstdcli.c
projects/VS2008/zstd/zstd.vcproj
projects/VS2008/zstdlib/zstdlib.vcproj
projects/VS2010/zstd/zstd.vcxproj
projects/VS2010/zstdlib/zstdlib.vcxproj
projects/cmake/lib/CMakeLists.txt
projects/cmake/programs/CMakeLists.txt