]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge remote-tracking branch 'upstream/master' into cmake-pkgconfig
authorNiLuJe <ninuje@gmail.com>
Fri, 24 Jan 2014 21:34:52 +0000 (22:34 +0100)
committerNiLuJe <ninuje@gmail.com>
Fri, 24 Jan 2014 21:34:52 +0000 (22:34 +0100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge