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

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

Module Name:    src
Committed By:   christos
Date:           Fri Mar 20 20:30:53 UTC 2009

Modified Files:
        src/external/bsd/am-utils/dist: ChangeLog amd2netbsd configure.in
        src/external/bsd/am-utils/dist/amd: amd.8 conf_tok.l ops_cdfs.c
            sun_map_parse.y sun_map_tok.l
        src/external/bsd/am-utils/dist/amq: amq.8
        src/external/bsd/am-utils/dist/doc: am-utils.texi
        src/external/bsd/am-utils/dist/fsinfo: fsi_lex.l
        src/external/bsd/am-utils/dist/hlfsd: hlfsd.8
        src/external/bsd/am-utils/dist/include: am_compat.h
        src/external/bsd/am-utils/dist/m4/macros: header_templates.m4

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/ChangeLog \
    src/external/bsd/am-utils/dist/configure.in
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/am-utils/dist/amd2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amd/amd.8 \
    src/external/bsd/am-utils/dist/amd/conf_tok.l \
    src/external/bsd/am-utils/dist/amd/ops_cdfs.c \
    src/external/bsd/am-utils/dist/amd/sun_map_parse.y \
    src/external/bsd/am-utils/dist/amd/sun_map_tok.l
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/amq/amq.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/doc/am-utils.texi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/fsinfo/fsi_lex.l
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/hlfsd/hlfsd.8
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/include/am_compat.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/am-utils/dist/m4/macros/header_templates.m4

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