aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2020-11-17 19:42:24 -0800
committerYann Collet <cyan@fb.com>2020-11-17 19:42:24 -0800
commit416bc96faca629abcef42e56ecd2e20d26b79934 (patch)
treef3c7f481efc46ac9123f5643e206b5953c919dc8
parentd44371841a2f1728a3f36839fd4b7e872d0927d3 (diff)
parentdb6edc43f78460ca2dc4b74b6e0f402cdf2e65d5 (diff)
downloadlz4-416bc96faca629abcef42e56ecd2e20d26b79934.tar.gz
Merge branch 'dev' into release
-rw-r--r--README.md2
-rw-r--r--tmpbin65536 -> 0 bytes
-rw-r--r--tmpsparsebin65536 -> 0 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index bdb028c2..b314e699 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ It is compatible with parallel builds (`-j#`).
[redirection]: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
[command redefinition]: https://www.gnu.org/prep/standards/html_node/Utilities-in-Makefiles.html
-Building LZ4 - Using vcpkg
+### Building LZ4 - Using vcpkg
You can download and install LZ4 using the [vcpkg](https://github.com/Microsoft/vcpkg) dependency manager:
diff --git a/tmp b/tmp
deleted file mode 100644
index c97c12f9..00000000
--- a/tmp
+++ /dev/null
Binary files differ
diff --git a/tmpsparse b/tmpsparse
deleted file mode 100644
index c97c12f9..00000000
--- a/tmpsparse
+++ /dev/null
Binary files differ