]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge master into release.
authorTim Kientzle <kientzle@acm.org>
Mon, 26 Mar 2012 04:03:35 +0000 (21:03 -0700)
committerTim Kientzle <kientzle@acm.org>
Mon, 26 Mar 2012 04:03:35 +0000 (21:03 -0700)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge