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/FAQ/ChangeLog | 4 ++++ doc/FAQ/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/FAQ') diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog index 579143f286..58a093c0bd 100644 --- a/doc/FAQ/ChangeLog +++ b/doc/FAQ/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * FAQ.texi, basic.t, build45.t, entry, tools.t: Merge from branch. diff --git a/doc/FAQ/Makefile.am b/doc/FAQ/Makefile.am index a2473d5b9c..7ca13bad06 100644 --- a/doc/FAQ/Makefile.am +++ b/doc/FAQ/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \ debug.texi freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi \ endoftime.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = -- cgit v1.2.3