]> git.ipfire.org Git - thirdparty/libarchive.git/commit
Merge branch 'encryption_detection' of github.com:kwk/libarchive into kwk-encryption_...
authorTim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:55:10 +0000 (20:55 -0800)
committerTim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:55:10 +0000 (20:55 -0800)
commit7a90710e0d3c786cf4f3af2457a815db6c9b5a5a
tree3aa72778798b038a32a712eecc5d9fd0b43aaa75
parent9c9928712d75594aab8d6e4e07de6cff7058fe3e
parent2de568ca5b0ccdbababf6e3857e2e05eea9eb0a6
Merge branch 'encryption_detection' of github.com:kwk/libarchive into kwk-encryption_detection

Conflicts:
libarchive/archive_read_support_format_zip.c
libarchive/archive.h
libarchive/archive_entry.h
libarchive/archive_read_support_format_mtree.c
libarchive/archive_read_support_format_tar.c
libarchive/archive_read_support_format_zip.c
libarchive/test/CMakeLists.txt