Module Name:	src
Committed By:	christos
Date:		Fri Apr 29 15:05:02 UTC 2005

Modified Files:
	src/gnu/usr.bin/gettext: Makefile Makefile.inc Makefile.inc.prog
	src/gnu/usr.bin/gettext/gettext: Makefile
	src/gnu/usr.bin/gettext/include: config.h
	src/gnu/usr.bin/gettext/info: Makefile
	src/gnu/usr.bin/gettext/libgrep: Makefile
	src/gnu/usr.bin/gettext/libnlspr: Makefile
	src/gnu/usr.bin/gettext/libnlsut: Makefile
	src/gnu/usr.bin/gettext/locale: Makefile
	src/gnu/usr.bin/gettext/msgattrib: Makefile
	src/gnu/usr.bin/gettext/msgcat: Makefile
	src/gnu/usr.bin/gettext/msgcmp: Makefile
	src/gnu/usr.bin/gettext/msgcomm: Makefile
	src/gnu/usr.bin/gettext/msgconv: Makefile
	src/gnu/usr.bin/gettext/msgen: Makefile
	src/gnu/usr.bin/gettext/msgexec: Makefile
	src/gnu/usr.bin/gettext/msgfilter: Makefile
	src/gnu/usr.bin/gettext/msgfmt: Makefile
	src/gnu/usr.bin/gettext/msggrep: Makefile
	src/gnu/usr.bin/gettext/msginit: Makefile
	src/gnu/usr.bin/gettext/msgmerge: Makefile
	src/gnu/usr.bin/gettext/msgunfmt: Makefile
	src/gnu/usr.bin/gettext/msguniq: Makefile
	src/gnu/usr.bin/gettext/xgettext: Makefile
Removed Files:
	src/gnu/usr.bin/gettext/lib: Makefile
	src/gnu/usr.bin/gettext/msgcat: .gdbinit
	src/gnu/usr.bin/gettext/msgconv: .gdbinit
	src/gnu/usr.bin/gettext/msgen: .gdbinit
	src/gnu/usr.bin/gettext/msgexec: .gdbinit
	src/gnu/usr.bin/gettext/msgfilter: .gdbinit
	src/gnu/usr.bin/gettext/msggrep: .gdbinit
	src/gnu/usr.bin/gettext/msginit: .gdbinit
	src/gnu/usr.bin/gettext/msguniq: .gdbinit

Log Message:
Merge conflicts and delete junk.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/gnu/usr.bin/gettext/Makefile
cvs rdiff -r1.5 -r1.6 src/gnu/usr.bin/gettext/Makefile.inc
cvs rdiff -r1.3 -r1.4 src/gnu/usr.bin/gettext/Makefile.inc.prog
cvs rdiff -r1.1 -r1.2 src/gnu/usr.bin/gettext/gettext/Makefile
cvs rdiff -r1.1 -r1.2 src/gnu/usr.bin/gettext/include/config.h
cvs rdiff -r1.2 -r1.3 src/gnu/usr.bin/gettext/info/Makefile
cvs rdiff -r1.4 -r0 src/gnu/usr.bin/gettext/lib/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/libgrep/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/libnlspr/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/libnlsut/Makefile
cvs rdiff -r1.1 -r1.2 src/gnu/usr.bin/gettext/locale/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgattrib/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msgcat/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgcat/Makefile
cvs rdiff -r1.1 -r1.2 src/gnu/usr.bin/gettext/msgcmp/Makefile
cvs rdiff -r1.1 -r1.2 src/gnu/usr.bin/gettext/msgcomm/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msgconv/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgconv/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msgen/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgen/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msgexec/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgexec/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msgfilter/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msgfilter/Makefile
cvs rdiff -r1.2 -r1.3 src/gnu/usr.bin/gettext/msgfmt/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msggrep/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msggrep/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msginit/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msginit/Makefile
cvs rdiff -r1.2 -r1.3 src/gnu/usr.bin/gettext/msgmerge/Makefile
cvs rdiff -r1.2 -r1.3 src/gnu/usr.bin/gettext/msgunfmt/Makefile
cvs rdiff -r1.1.1.1 -r0 src/gnu/usr.bin/gettext/msguniq/.gdbinit
cvs rdiff -r1.1.1.1 -r1.2 src/gnu/usr.bin/gettext/msguniq/Makefile
cvs rdiff -r1.2 -r1.3 src/gnu/usr.bin/gettext/xgettext/Makefile

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