]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
authorinikep <inikep@gmail.com>
Thu, 21 Apr 2016 10:30:58 +0000 (12:30 +0200)
committerinikep <inikep@gmail.com>
Thu, 21 Apr 2016 10:30:58 +0000 (12:30 +0200)
1  2 
programs/zstdcli.c

Simple merge