Merge branch 'archive-version-details' of github.com:rosslagerwall/libarchive into...

author Tim Kientzle <kientzle@gmail.com>

Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)

committer Tim Kientzle <kientzle@gmail.com>

Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)
author Tim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)
committer Tim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)
diff --cc cpio/cpio.c
Simple merge
diff --cc libarchive/archive.h
Simple merge
diff --cc libarchive/test/main.c
Simple merge
diff --cc tar/bsdtar.c
Simple merge
author	Tim Kientzle <kientzle@gmail.com>
	Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)
committer	Tim Kientzle <kientzle@gmail.com>
	Fri, 20 Dec 2013 04:19:19 +0000 (20:19 -0800)
		1	2
cpio/cpio.c	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive.h	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/test/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
tar/bsdtar.c	patch \|	diff1 \|	diff2 \|	blob \| history