summaryrefslogtreecommitdiffstats
path: root/doc/supplements
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:39 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:39 +0000
commitf2f3772afa7477d7679c101bbe1daf4b5e482878 (patch)
tree44c364ede43b498f3e605dd5315a8e38ef756ce6 /doc/supplements
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-f2f3772afa7477d7679c101bbe1daf4b5e482878.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* sh.texi: Merge from branch.
Diffstat (limited to 'doc/supplements')
-rw-r--r--doc/supplements/sh/ChangeLog4
-rw-r--r--doc/supplements/sh/sh.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/sh/ChangeLog b/doc/supplements/sh/ChangeLog
index 221ec1e2e7..a8567d8d39 100644
--- a/doc/supplements/sh/ChangeLog
+++ b/doc/supplements/sh/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * sh.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/sh/sh.texi b/doc/supplements/sh/sh.texi
index e8e07a0f19..50dff26ec6 100644
--- a/doc/supplements/sh/sh.texi
+++ b/doc/supplements/sh/sh.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements