summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/libarchive/archive_write_disk_windows.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-06-201-3/+11
| | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-211-2/+4
| | | | Resolve conflicts by integrating changes from both sides.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-031-1/+1
| | | | | | Resolve conflicts in favor of the upstream side where possible. Resolve a logical conflict in archive_windows.h where the upstream port to Watcom was done slightly differently from ours.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2013-07-311-112/+63
| | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2012-01-051-1/+27
| | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2011-12-201-0/+2525
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.