Merge branch 'dev' into decTest

diff --cc contrib/single_file_decoder/build_test.sh
Simple merge

diff --cc contrib/single_file_decoder/combine.sh
Simple merge

diff --cc contrib/single_file_decoder/create_single_file_decoder.sh
index 49f14cbd3dc6e59cd9ffcf7a6ee956030b9b9877,0000000000000000000000000000000000000000..5f6ba2977b3bf7733f92121cd7fecd4c44b49e56
mode 100755,000000..100755
--- 1/contrib/single_file_decoder/create_single_file_decoder.sh
--- /dev/null
+++ b/contrib/single_file_decoder/create_single_file_decoder.sh
@@@ -1,14 -1,0 +1,15 @@@
 +#!/bin/bash
 +
 +# Where to find the sources
 +ZSTD_SRC_ROOT="../../lib"
 +
 +
 +# Amalgamate the sources
++echo "Amalgamating files... this can take a while"
 +./combine.sh -r "$ZSTD_SRC_ROOT" -r "$ZSTD_SRC_ROOT/common" -r "$ZSTD_SRC_ROOT/decompress" -o zstddeclib.c zstddeclib-in.c
 +# Did combining work?
 +if [ $? -ne 0 ]; then
 +  echo "Combine script: FAILED"
 +  exit 1
 +fi
 +echo "Combine script: PASSED"