CVS commit: src/dist/libarchive/libarchive

[Joerg Sonnenberger <joerg%netbsd.org@localhost>]

Module Name:    src
Committed By:   joerg
Date:           Sun May 25 19:18:49 UTC 2008

Modified Files:
        src/dist/libarchive/libarchive: archive_entry_link_resolver.c
            archive_write_disk.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 \
    src/dist/libarchive/libarchive/archive_entry_link_resolver.c
cvs rdiff -r1.4 -r1.5 src/dist/libarchive/libarchive/archive_write_disk.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.