]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorTim Kientzle <kientzle@acm.org>
Sun, 5 Aug 2012 17:42:05 +0000 (10:42 -0700)
committerTim Kientzle <kientzle@acm.org>
Sun, 5 Aug 2012 17:42:05 +0000 (10:42 -0700)
1  2 
libarchive/archive.h

Simple merge