]> git.ipfire.org Git - thirdparty/libarchive.git/commit
Merge remote-tracking branch 'remotes/origin/master' into zstd_windows
authorReshetnikov Alexandr <hemn.still@gmail.com>
Tue, 12 Apr 2022 09:48:51 +0000 (13:48 +0400)
committerReshetnikov Alexandr <hemn.still@gmail.com>
Tue, 12 Apr 2022 09:50:53 +0000 (13:50 +0400)
commit966d164f40d69a7ba02c61ad2ed6d6368722b2ae
tree9d26a409266eafc4dd21e1056c809be07cb9befa
parentbbec4636b0d01c24663ff110a5a5538bcc191eb5
parent042956b1b828d57f142f36ae8f27519c7700bb71
Merge remote-tracking branch 'remotes/origin/master' into zstd_windows

# Conflicts:
# build/ci/github_actions/ci.cmd
build/ci/github_actions/ci.cmd