diff options
| author | peter <peter@FreeBSD.org> | 2004-06-10 19:05:38 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-06-10 19:05:38 +0000 |
| commit | 8416bda1d23bda4666a5b880a9d78eccaa640036 (patch) | |
| tree | 7d97944b58f1e30ab542f9c3d6720b69314cec4d /contrib/cvs/diff | |
| parent | 3d101ef985844544d089e129157a94a0640fd246 (diff) | |
| download | FreeBSD-src-8416bda1d23bda4666a5b880a9d78eccaa640036.zip FreeBSD-src-8416bda1d23bda4666a5b880a9d78eccaa640036.tar.gz | |
Import cvs-1.11.17 onto vendor branch.
Diffstat (limited to 'contrib/cvs/diff')
| -rw-r--r-- | contrib/cvs/diff/ChangeLog | 15 | ||||
| -rw-r--r-- | contrib/cvs/diff/Makefile.am | 3 | ||||
| -rw-r--r-- | contrib/cvs/diff/Makefile.in | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/contrib/cvs/diff/ChangeLog b/contrib/cvs/diff/ChangeLog index dbbea3f..b90cebe 100644 --- a/contrib/cvs/diff/ChangeLog +++ b/contrib/cvs/diff/ChangeLog @@ -1,3 +1,18 @@ +2004-05-15 Derek Price <derek@ximbiot.com> + + * libdiff.dsp: Header file list updated. + * libdiff.dep: Regenerated for "libdiff.dsp" changes. + * libdiff.mak: Regenerated for "libdiff.dsp" changes. + (Patch from Conrad Pino <conrad@pino.com>.) + +2004-05-13 Derek Price <derek@ximbiot.com> + + * .cvsignore: Changed for "libdiff.dsp" changes. + * libdiff.dep: Added for "../cvsnt.dsw" changes. + * libdiff.dsp: Changed for "../cvsnt.dsw" changes. + * libdiff.mak: Regenerated for "../cvsnt.dsw" changes. + (Patch from Conrad Pino <conrad@pino.com>.) + 2004-03-20 Derek Price <derek@ximbiot.com> * diff.c (diff_run): Update string arg to const. diff --git a/contrib/cvs/diff/Makefile.am b/contrib/cvs/diff/Makefile.am index 38ed80e..96462e5 100644 --- a/contrib/cvs/diff/Makefile.am +++ b/contrib/cvs/diff/Makefile.am @@ -21,4 +21,5 @@ libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \ context.c ed.c normal.c ifdef.c util.c dir.c version.c diff.h \ side.c system.h diffrun.h -EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp +EXTRA_DIST = ChangeLog build_diff.com diagmeet.note \ + libdiff.dep libdiff.dsp libdiff.mak diff --git a/contrib/cvs/diff/Makefile.in b/contrib/cvs/diff/Makefile.in index d3a7dbe..393bd1f 100644 --- a/contrib/cvs/diff/Makefile.in +++ b/contrib/cvs/diff/Makefile.in @@ -134,7 +134,9 @@ libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \ side.c system.h diffrun.h -EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp +EXTRA_DIST = ChangeLog build_diff.com diagmeet.note \ + libdiff.dep libdiff.dsp libdiff.mak + subdir = diff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
