Module Name:	gnusrc
Committed By:	itojun
Date:		Tue Jun 13 17:18:40 UTC 2000

Modified Files:
	gnusrc/gnu/dist/sendmail: RELEASE_NOTES
	gnusrc/gnu/dist/sendmail/cf/cf: generic-bsd4.4.cf generic-hpux10.cf
	    generic-hpux9.cf generic-linux.cf generic-osf1.cf
	    generic-solaris2.cf generic-sunos4.1.cf generic-ultrix4.cf
	gnusrc/gnu/dist/sendmail/cf/m4: version.m4
	gnusrc/gnu/dist/sendmail/cf/ostype: solaris2.pre5.m4
	gnusrc/gnu/dist/sendmail/devtools/OS: OSF1.V5.0
	gnusrc/gnu/dist/sendmail/libmilter: Makefile
	gnusrc/gnu/dist/sendmail/libsmdb: Makefile
	gnusrc/gnu/dist/sendmail/libsmutil: Makefile
	gnusrc/gnu/dist/sendmail/sendmail: deliver.c main.c readcf.c
	    recipient.c util.c version.c

Log Message:
resolve conflicts. (mainly due to $Id$ mistake in past import)


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/RELEASE_NOTES
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-hpux10.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-hpux9.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-linux.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-osf1.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-solaris2.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf \
    gnusrc/gnu/dist/sendmail/cf/cf/generic-ultrix4.cf
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/cf/m4/version.m4
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/cf/ostype/solaris2.pre5.m4
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/devtools/OS/OSF1.V5.0
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/libmilter/Makefile
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/libsmdb/Makefile
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/libsmutil/Makefile
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/sendmail/sendmail/deliver.c \
    gnusrc/gnu/dist/sendmail/sendmail/main.c \
    gnusrc/gnu/dist/sendmail/sendmail/readcf.c \
    gnusrc/gnu/dist/sendmail/sendmail/recipient.c \
    gnusrc/gnu/dist/sendmail/sendmail/util.c \
    gnusrc/gnu/dist/sendmail/sendmail/version.c

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