]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
authorinikep <inikep@gmail.com>
Tue, 10 May 2016 11:20:01 +0000 (13:20 +0200)
committerinikep <inikep@gmail.com>
Tue, 10 May 2016 11:20:01 +0000 (13:20 +0200)
commited9a08538c0bddaf2f773014e5a098e3e66414eb
tree5d94537812a2ca222f52e054586b0028c4825828
parent349fcf7ea28c923f0b1a30be16341af627638682
parentd69311711385adc8afcced0bbe7e1f28a3cc79f2
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts:
# lib/common/util.h
# programs/paramgrill.c
# visual/2013/fullbench/fullbench.vcxproj.filters
# visual/2013/fuzzer/fuzzer.vcxproj.filters
lib/common/fse_decompress.c
programs/bench.c
programs/dibio.c
programs/fileio.c