]> git.ipfire.org Git - thirdparty/libarchive.git/commit
Merge branch 'master' of github.com:libarchive/libarchive
authorSergiu Dotenco <sergiu.dotenco@gmail.com>
Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
committerSergiu Dotenco <sergiu.dotenco@gmail.com>
Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
commit227d528b0686242e26f2bc2edb31e156bb409fdc
treeae53ee588b34822c1602adafbb50ccb9a7a52fdb
parent81ce2c24f9fec640740de9bcea920ab71ef89059
parentfc04ba0941fed6b55fa5b90858e1104c8c937d72
Merge branch 'master' of github.com:libarchive/libarchive

Conflicts:
libarchive/archive_read_support_format_zip.c
libarchive/archive_read_support_format_zip.c
libarchive/archive_write_set_format_warc.c