Merge branch 'master' of github.com:kientzle/libarchive-zip64

author Tim Kientzle <kientzle@gmail.com>

Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)

committer Tim Kientzle <kientzle@gmail.com>

Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)
author Tim Kientzle <kientzle@gmail.com>
Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)
committer Tim Kientzle <kientzle@gmail.com>
Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)
diff --cc libarchive/archive_read_support_format_zip.c
Simple merge
diff --cc libarchive/archive_write_set_format_zip.c
Simple merge
author	Tim Kientzle <kientzle@gmail.com>
	Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)
committer	Tim Kientzle <kientzle@gmail.com>
	Wed, 25 Dec 2013 17:57:37 +0000 (09:57 -0800)
		1	2
libarchive/archive_read_support_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive_write_set_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history