tree 673604b7fab711da396b2f6a7071e25425fddada
parent 5d500b60e7eb63106dcf8e1848c1d396f320a9d3
parent cf6edcd0a13fd7f2dc85384e3883886535960d23
author inikep <inikep@gmail.com> 1464732429 +0200
committer inikep <inikep@gmail.com> 1464732429 +0200

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