Resolved merge conflict dev+zstdmt

2017-01-20 16:44:50 -08:00
parent f0ffa237da 900f39e709
commit d7e3cb58c5
35 changed files with 1834 additions and 267 deletions
@@ -2,6 +2,8 @@
 # Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
+# This Makefile is validated for Linux, macOS, *BSD, Hurd, Solaris, MSYS2 targets
+#
 # 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.