ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Cyan4973/dev070' into dev070

Browse Source 
# Conflicts:
#	.gitignore
#	lib/decompress/zstd_decompress.c
#	programs/zbufftest.c
This commit is contained in:
inikep
2016-06-01 09:16:11 +02:00
parent 00fa1ae0c0 202844ebd0
commit 5c2771710d
11 changed files with 138 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -31,7 +31,7 @@ projects/VS2015
.directory
_codelite/
_zstdbench/
zlib_wrapper/
.clang_complete
# CMake
projects/cmake/