Merge branch 'dev' into customMem
authorYann Collet <cyan@fb.com>
Mon, 9 Nov 2020 07:26:19 +0000 (23:26 -0800)
committerYann Collet <cyan@fb.com>
Mon, 9 Nov 2020 07:26:19 +0000 (23:26 -0800)
1  2 
lib/lz4.c
lib/lz4hc.c
tests/fullbench.c

diff --cc lib/lz4.c
Simple merge
diff --cc lib/lz4hc.c
Simple merge
Simple merge