Merge pull request #252 from inikep/dev
authorYann Collet <Cyan4973@users.noreply.github.com>
Fri, 4 Nov 2016 20:54:19 +0000 (13:54 -0700)
committerGitHub <noreply@github.com>
Fri, 4 Nov 2016 20:54:19 +0000 (13:54 -0700)
Dev

1  2 
programs/lz4cli.c
tests/Makefile

Simple merge
diff --cc tests/Makefile
Simple merge