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
..
2016-05-20 14:36:36 +02:00
2016-05-13 11:27:56 +02:00
2016-05-20 14:36:36 +02:00
2016-05-20 14:36:36 +02:00
2016-05-20 14:36:36 +02:00
2016-05-29 01:06:30 +02:00
2016-05-29 01:06:30 +02:00
2016-05-30 04:48:32 +02:00
2016-05-29 01:06:30 +02:00