summaryrefslogtreecommitdiffstats
path: root/doc/supplements
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:14 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:14 +0000
commit7828a1490ee340f43525051290d6a03e826e3f1d (patch)
treeb7e8d905a0c23577e08cac02cdbaafa06b9da98d /doc/supplements
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-7828a1490ee340f43525051290d6a03e826e3f1d.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* c4x.texi: Merge from branch.
Diffstat (limited to 'doc/supplements')
-rw-r--r--doc/supplements/c4x/ChangeLog4
-rw-r--r--doc/supplements/c4x/c4x.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/c4x/ChangeLog b/doc/supplements/c4x/ChangeLog
index f32e8528d1..7c4ba997a1 100644
--- a/doc/supplements/c4x/ChangeLog
+++ b/doc/supplements/c4x/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * c4x.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/c4x/c4x.texi b/doc/supplements/c4x/c4x.texi
index 594f95df87..49fa76fd34 100644
--- a/doc/supplements/c4x/c4x.texi
+++ b/doc/supplements/c4x/c4x.texi
@@ -22,6 +22,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements