summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:57 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:57 +0000
commitdfcace4998ceb2fb9f052bb29aabceaa40ca87f4 (patch)
treea29de6b8bf28b9733a788fe1aafa0c7101c426a5
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-dfcace4998ceb2fb9f052bb29aabceaa40ca87f4.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* i960.texi: Merge from branch.
-rw-r--r--doc/supplements/i960/ChangeLog4
-rw-r--r--doc/supplements/i960/i960.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/i960/ChangeLog b/doc/supplements/i960/ChangeLog
index c1f56ea5a8..e3d66d046f 100644
--- a/doc/supplements/i960/ChangeLog
+++ b/doc/supplements/i960/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * i960.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/i960/i960.texi b/doc/supplements/i960/i960.texi
index 630c95a41f..573964e02a 100644
--- a/doc/supplements/i960/i960.texi
+++ b/doc/supplements/i960/i960.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements