summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:07 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:07 +0000
commite440b90b347982decefe3a6a010b69448e7e2920 (patch)
tree1b4b951c852cea315aabeb0f47c73c56fac6359b /doc
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-e440b90b347982decefe3a6a010b69448e7e2920.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* i386.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/supplements/i386/ChangeLog4
-rw-r--r--doc/supplements/i386/i386.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/i386/ChangeLog b/doc/supplements/i386/ChangeLog
index 6fce1c45ee..4ead789555 100644
--- a/doc/supplements/i386/ChangeLog
+++ b/doc/supplements/i386/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * i386.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/i386/i386.texi b/doc/supplements/i386/i386.texi
index 65ecd8c9ce..23c92718bc 100644
--- a/doc/supplements/i386/i386.texi
+++ b/doc/supplements/i386/i386.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements