CVS commit: src/external/gpl2/gettext

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

Module Name:    src
Committed By:   christos
Date:           Tue Jan 12 22:58:03 UTC 2016

Modified Files:
        src/external/gpl2/gettext/dist: Makefile.in
        src/external/gpl2/gettext/dist/autoconf-lib-link: Makefile.in
        src/external/gpl2/gettext/dist/gettext-runtime: Makefile.am Makefile.in
        src/external/gpl2/gettext/dist/gettext-runtime/libasprintf: Makefile.in
        src/external/gpl2/gettext/dist/gettext-tools: Makefile.am Makefile.in
        src/external/gpl2/gettext/dist/gettext-tools/doc: Makefile.in texi2html
        src/external/gpl2/gettext/dist/gettext-tools/gnulib-lib: javaversion.c
        src/external/gpl2/gettext/dist/gettext-tools/libuniname: uniname.c
        src/external/gpl2/gettext/dist/gettext-tools/misc: Makefile.in
        src/external/gpl2/gettext/dist/gettext-tools/src: message.h
            msgl-fsearch.c po-lex.c
Added Files:
        src/external/gpl2/gettext: Makefile Makefile.inc gettext2netbsd
        src/external/gpl2/gettext/bin: Makefile Makefile.inc.prog
        src/external/gpl2/gettext/bin/gettext: Makefile
        src/external/gpl2/gettext/bin/gettextize: Makefile gettextize
        src/external/gpl2/gettext/bin/msgattrib: Makefile
        src/external/gpl2/gettext/bin/msgcat: Makefile
        src/external/gpl2/gettext/bin/msgcmp: Makefile
        src/external/gpl2/gettext/bin/msgcomm: Makefile
        src/external/gpl2/gettext/bin/msgconv: Makefile
        src/external/gpl2/gettext/bin/msgen: Makefile
        src/external/gpl2/gettext/bin/msgexec: Makefile
        src/external/gpl2/gettext/bin/msgfilter: Makefile
        src/external/gpl2/gettext/bin/msgfmt: Makefile
        src/external/gpl2/gettext/bin/msggrep: Makefile
        src/external/gpl2/gettext/bin/msginit: Makefile
        src/external/gpl2/gettext/bin/msgmerge: Makefile
        src/external/gpl2/gettext/bin/msgunfmt: Makefile
        src/external/gpl2/gettext/bin/msguniq: Makefile
        src/external/gpl2/gettext/bin/xgettext: Makefile
        src/external/gpl2/gettext/include: alloca.h byteswap.h config.h
            gettext-po.h libgnuintl.h
        src/external/gpl2/gettext/info: Makefile
        src/external/gpl2/gettext/lib: Makefile
        src/external/gpl2/gettext/lib/libgrep: Makefile
        src/external/gpl2/gettext/lib/libnlspr: Makefile
        src/external/gpl2/gettext/lib/libnlsut: Makefile
        src/external/gpl2/gettext/locale: Makefile

Log Message:
merge conflicts and add reach-over Makefiles


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/Makefile \
    src/external/gpl2/gettext/Makefile.inc \
    src/external/gpl2/gettext/gettext2netbsd
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/Makefile \
    src/external/gpl2/gettext/bin/Makefile.inc.prog
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/gettext/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/gettextize/Makefile \
    src/external/gpl2/gettext/bin/gettextize/gettextize
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgattrib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgcat/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgcmp/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgcomm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgconv/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgen/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgexec/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgfilter/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgfmt/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msggrep/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msginit/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgmerge/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msgunfmt/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/msguniq/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/bin/xgettext/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gettext/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/autoconf-lib-link/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-runtime/Makefile.am \
    src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-runtime/libasprintf/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/Makefile.am \
    src/external/gpl2/gettext/dist/gettext-tools/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/doc/Makefile.in \
    src/external/gpl2/gettext/dist/gettext-tools/doc/texi2html
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/gnulib-lib/javaversion.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/libuniname/uniname.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/misc/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl2/gettext/dist/gettext-tools/src/message.h \
    src/external/gpl2/gettext/dist/gettext-tools/src/msgl-fsearch.c \
    src/external/gpl2/gettext/dist/gettext-tools/src/po-lex.c
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/include/alloca.h \
    src/external/gpl2/gettext/include/byteswap.h \
    src/external/gpl2/gettext/include/config.h \
    src/external/gpl2/gettext/include/gettext-po.h \
    src/external/gpl2/gettext/include/libgnuintl.h
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/info/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/lib/libgrep/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/lib/libnlspr/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/lib/libnlsut/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/gettext/locale/Makefile

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