CVS commit: src/external/bsd/am-utils

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Jan 17 17:46:32 UTC 2015

Modified Files:
        src/external/bsd/am-utils/bin/fsinfo: Makefile
        src/external/bsd/am-utils/dist: ChangeLog
        src/external/bsd/am-utils/dist/amd: amd.8 amfs_generic.c conf_tok.l
            ops_cdfs.c readdir.c sun_map_parse.y sun_map_tok.l
        src/external/bsd/am-utils/dist/amq: amq.8 amq.c
        src/external/bsd/am-utils/dist/conf/transp: transp_sockets.c
        src/external/bsd/am-utils/dist/doc: am-utils.texi
        src/external/bsd/am-utils/dist/fixmount: fixmount.8
        src/external/bsd/am-utils/dist/fsinfo: fsi_lex.l
        src/external/bsd/am-utils/dist/hlfsd: hlfsd.8 hlfsd.c homedir.c stubs.c
        src/external/bsd/am-utils/dist/include: am_compat.h am_defs.h
        src/external/bsd/am-utils/dist/libamu: mount_fs.c
        src/external/bsd/am-utils/dist/m4/macros: header_templates.m4
            save_state.m4
        src/external/bsd/am-utils/include: amu_autofs_prot.h amu_nfs_prot.h
            config.h
        src/external/bsd/am-utils/lib/libamu: shlib_version
Added Files:
        src/external/bsd/am-utils: amd2netbsd
Removed Files:
        src/external/bsd/am-utils/dist: configure.in
        src/external/bsd/am-utils/dist/libamu: strdup.c
        src/external/bsd/am-utils/dist/m4/macros: libtool.m4
        src/external/bsd/am-utils/dist/scripts: expn.1 expn.in

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/am-utils/amd2netbsd
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/bin/fsinfo/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/dist/ChangeLog
cvs rdiff -u -r1.3 -r0 src/external/bsd/am-utils/dist/configure.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/amd/amd.8 \
    src/external/bsd/am-utils/dist/amd/ops_cdfs.c \
    src/external/bsd/am-utils/dist/amd/sun_map_parse.y
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/bsd/am-utils/dist/amd/amfs_generic.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/dist/amd/conf_tok.l \
    src/external/bsd/am-utils/dist/amd/sun_map_tok.l
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amd/readdir.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/amq/amq.8
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/am-utils/dist/amq/amq.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/bsd/am-utils/dist/conf/transp/transp_sockets.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/doc/am-utils.texi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/fixmount/fixmount.8
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/hlfsd/hlfsd.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/hlfsd/hlfsd.c \
    src/external/bsd/am-utils/dist/hlfsd/homedir.c \
    src/external/bsd/am-utils/dist/hlfsd/stubs.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/dist/include/am_compat.h \
    src/external/bsd/am-utils/dist/include/am_defs.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/libamu/mount_fs.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/am-utils/dist/libamu/strdup.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/am-utils/dist/m4/macros/header_templates.m4
cvs rdiff -u -r1.2 -r0 src/external/bsd/am-utils/dist/m4/macros/libtool.m4
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/am-utils/dist/m4/macros/save_state.m4
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/am-utils/dist/scripts/expn.1 \
    src/external/bsd/am-utils/dist/scripts/expn.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/include/amu_autofs_prot.h \
    src/external/bsd/am-utils/include/amu_nfs_prot.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/am-utils/include/config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/lib/libamu/shlib_version

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