Merge remote-tracking branch 'refs/remotes/Cyan4973/dev060' into dev

# Conflicts: # lib/zstd_compress.c # programs/bench.c
2016-03-22 14:38:34 +01:00
parent d700a1a8b9 5a854af006
commit 2872b6f01f
30 changed files with 1438 additions and 1508 deletions
@@ -5,6 +5,8 @@ fullbench
 fullbench32
 fuzzer
 fuzzer32
+zbufftest
+zbufftest32
 datagen
 paramgrill