diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:36:28 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:36:28 +0000 |
| commit | 898505736e85780855634220c8cc25e9dd11d418 (patch) | |
| tree | 6cbf99604fc39ba1fae42ff33f1a3eefee989664 /doc/supplements/i960 | |
| parent | 2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-898505736e85780855634220c8cc25e9dd11d418.tar.bz2 | |
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to 'doc/supplements/i960')
| -rw-r--r-- | doc/supplements/i960/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/supplements/i960/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/supplements/i960/ChangeLog b/doc/supplements/i960/ChangeLog index e3d66d046f..8d680f8a5b 100644 --- a/doc/supplements/i960/ChangeLog +++ b/doc/supplements/i960/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> * i960.texi: Merge from branch. diff --git a/doc/supplements/i960/Makefile.am b/doc/supplements/i960/Makefile.am index fc6859166e..778ac4609e 100644 --- a/doc/supplements/i960/Makefile.am +++ b/doc/supplements/i960/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timeCVME961.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi FILES = preface.texi |