]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge branch 'master' of https://github.com/libarchive/libarchive into cng_enable 841/head
authorJ. Peter Mugaas <jpmugaas@suddenlink.net>
Sun, 5 Mar 2017 14:59:25 +0000 (09:59 -0500)
committerJ. Peter Mugaas <jpmugaas@suddenlink.net>
Sun, 5 Mar 2017 14:59:25 +0000 (09:59 -0500)
1  2 
CMakeLists.txt
configure.ac

diff --cc CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge