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/networking/ChangeLog | 4 ++++ doc/networking/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/networking') diff --git a/doc/networking/ChangeLog b/doc/networking/ChangeLog index 11477a322d..7778f3894c 100644 --- a/doc/networking/ChangeLog +++ b/doc/networking/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * networking.texi: Merge from branch. diff --git a/doc/networking/Makefile.am b/doc/networking/Makefile.am index 38163707e1..84af3a7e23 100644 --- a/doc/networking/Makefile.am +++ b/doc/networking/Makefile.am @@ -18,8 +18,7 @@ BMENU2 += -c GENERATED_FILES = networkapp.texi driver.texi networktasks.texi testing.texi \ servers.texi decdriver.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = networktasks.texi preface.texi -- cgit v1.2.3