Merge remote-tracking branch 'refs/remotes/origin/v05x' into dev

author inikep <inikep@gmail.com>

Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)

committer inikep <inikep@gmail.com>

Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)
author inikep <inikep@gmail.com>
Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)
committer inikep <inikep@gmail.com>
Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)
diff --cc lib/zstd_compress.c
Simple merge
diff --cc lib/zstd_decompress.c
Simple merge
diff --cc lib/zstd_static.h
Simple merge
author	inikep <inikep@gmail.com>
	Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)
committer	inikep <inikep@gmail.com>
	Fri, 5 Feb 2016 08:22:10 +0000 (09:22 +0100)
		1	2
lib/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd_decompress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd_static.h	patch \|	diff1 \|	diff2 \|	blob \| history