]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'adapt-approach-4' into dev
authorPaul Cruz <paulcruz74@fb.com>
Mon, 31 Jul 2017 18:43:01 +0000 (11:43 -0700)
committerPaul Cruz <paulcruz74@fb.com>
Mon, 31 Jul 2017 18:43:01 +0000 (11:43 -0700)
1  2 
lib/compress/zstd_compress.c
lib/zstd.h

Simple merge
diff --cc lib/zstd.h
Simple merge