CVS commit: pkgsrc/archivers/libarchive/files

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun May 25 19:45:02 UTC 2008

Modified Files:
        pkgsrc/archivers/libarchive/files/libarchive:
            archive_entry_link_resolver.c
Removed Files:
        pkgsrc/archivers/libarchive/files/libarchive: archive.h.in
        pkgsrc/archivers/libarchive/files/tar/test/old: config.sh test-acl.sh
            test-basic.sh test-deep-dir.sh test-flags.sh test-nodump.sh
            test-overwrite.sh test-utf8.sh

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1.1.6 -r0 \
    pkgsrc/archivers/libarchive/files/libarchive/archive.h.in
cvs rdiff -r1.2 -r1.3 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c
cvs rdiff -r1.1.1.1 -r0 \
    pkgsrc/archivers/libarchive/files/tar/test/old/config.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-acl.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-basic.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-deep-dir.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-flags.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-nodump.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-overwrite.sh \
    pkgsrc/archivers/libarchive/files/tar/test/old/test-utf8.sh

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