summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:55 +0000
commita137edf42d9a43c68b8fea7d9d254f055c15c205 (patch)
tree0e2cf230ceed064d3824160acac3570177daff45 /doc
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-a137edf42d9a43c68b8fea7d9d254f055c15c205.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* m68k.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/supplements/m68k/ChangeLog4
-rw-r--r--doc/supplements/m68k/m68k.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/m68k/ChangeLog b/doc/supplements/m68k/ChangeLog
index 07692a3fd6..9e68258f21 100644
--- a/doc/supplements/m68k/ChangeLog
+++ b/doc/supplements/m68k/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * m68k.texi: Merge from branch.
+
2003-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* cpumodel.t: Reflect c/src/exec having moved to cpukit.
diff --git a/doc/supplements/m68k/m68k.texi b/doc/supplements/m68k/m68k.texi
index 1900383f84..b14c58e62f 100644
--- a/doc/supplements/m68k/m68k.texi
+++ b/doc/supplements/m68k/m68k.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements