]> git.ipfire.org Git - thirdparty/zstd.git/commit
Merge branch 'modTests' into dev
authorYann Collet <cyan@fb.com>
Fri, 1 Sep 2017 00:00:16 +0000 (17:00 -0700)
committerYann Collet <cyan@fb.com>
Fri, 1 Sep 2017 00:00:16 +0000 (17:00 -0700)
commitc7818fc67647fe414d115146f7ec9832d53febc2
treeb8435048baeabdf94b1ed1a12cc338ac5d79fd1b
parent4299c271323d988c4e76d907f0a6710e2cd959d2
parent4e81dc04f9fc00b563afcc8adf5c5d1754569db1
Merge branch 'modTests' into dev

fixed conflict
appveyor.yml