From bcdaffdf50895c349fd3fd6a702c2ac481ba7177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:10:42 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/relnotes/ChangeLog | 4 ++++ doc/relnotes/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/relnotes') diff --git a/doc/relnotes/ChangeLog b/doc/relnotes/ChangeLog index acc2c436cc..81132f7e74 100644 --- a/doc/relnotes/ChangeLog +++ b/doc/relnotes/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * install.texi, intro.texi, relnotes.texi, status.texi: Merge from diff --git a/doc/relnotes/Makefile.am b/doc/relnotes/Makefile.am index ebf8df93b0..e86ee9af0a 100644 --- a/doc/relnotes/Makefile.am +++ b/doc/relnotes/Makefile.am @@ -13,8 +13,7 @@ EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/main.am -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = install.texi intro.texi probrep.texi relnotes.texi status.texi -- cgit v1.2.3