diff options
Diffstat (limited to 'doc/new_chapters')
-rw-r--r-- | doc/new_chapters/ChangeLog | 4 | ||||
-rw-r--r-- | doc/new_chapters/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/new_chapters/ChangeLog b/doc/new_chapters/ChangeLog index 8b1cad5313..16c9cb6b86 100644 --- a/doc/new_chapters/ChangeLog +++ b/doc/new_chapters/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill <joel@OARcorp.com> * new_chapters.texi: Merge from branch. diff --git a/doc/new_chapters/Makefile.am b/doc/new_chapters/Makefile.am index 1a9d39c06a..3f2daf69a6 100644 --- a/doc/new_chapters/Makefile.am +++ b/doc/new_chapters/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = adminiface.texi confspace.texi dumpcontrol.texi \ eventlog.texi stackchk.texi rtmonuse.texi cpuuse.texi error.texi \ monitor.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = |