Merge branch 'dev' into btopt
authorYann Collet <cyan@fb.com>
Wed, 1 Nov 2017 00:55:01 +0000 (17:55 -0700)
committerYann Collet <cyan@fb.com>
Wed, 1 Nov 2017 00:55:01 +0000 (17:55 -0700)
1  2 
lib/lz4.c

diff --cc lib/lz4.c
Simple merge