merge

diff --cc lib/common/zbuff.h
index 3818af4748209e7b86fce7121a3bd9176b5a2a95,41cb4c9b53fbe778e1f84d43900e74695569b15a..f99e0619763f27e1ea016acda9341dcde7c02452
--- 1/lib/common/zbuff.h
--- 2/lib/common/zbuff.h
+++ b/lib/common/zbuff.h
@@@ -1,42 -1,12 +1,20 @@@
- /*
-     Buffered version of Zstd compression library
-     Copyright (C) 2015-2016, Yann Collet.
- 
-     BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- 
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions are
-     met:
-     * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following disclaimer
-     in the documentation and/or other materials provided with the
-     distribution.
-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-     A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-     OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-     LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-     DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-     You can contact the author at :
-     - zstd homepage : http://www.zstd.net/
- */
+ /**
+  * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
+  * All rights reserved.
+  *
+  * This source code is licensed under the BSD-style license found in the
+  * LICENSE file in the root directory of this source tree. An additional grant
+  * of patent rights can be found in the PATENTS file in the same directory.
+  */
  
 +/* ***************************************************************
 +*  NOTES/WARNINGS
 +*****************************************************************/
 +/* The streaming API defined here will soon be deprecated by the
 +* new one in 'zstd.h'; consider migrating towards newer streaming
 +* API. See 'lib/README.md'.
 +*****************************************************************/
 +
  #ifndef ZSTD_BUFFERED_H_23987
  #define ZSTD_BUFFERED_H_23987
  

diff --cc lib/compress/huf_compress.c
Simple merge

diff --cc lib/compress/zbuff_compress.c
Simple merge

diff --cc lib/compress/zstd_compress.c
Simple merge

diff --cc lib/decompress/zbuff_decompress.c
Simple merge

diff --cc lib/decompress/zstd_decompress.c
Simple merge