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
@@ -70,7 +70,7 @@ clean:
 	@$(MAKE) -C $(TESTDIR) $@ > $(VOID)
 	@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
 	@$(MAKE) -C examples/ $@ > $(VOID)
-	@$(RM) zstd$(EXT) tmp*
+	@$(RM) zstd$(EXT) zstdmt$(EXT) tmp*
 	@echo Cleaning completed