summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:37 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:37 +0000
commit80fe92203ddf310ad9bec0f16dfe3cf88e622d52 (patch)
tree6d13106f8adf56facf155d13b34313d60e345042 /doc
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-80fe92203ddf310ad9bec0f16dfe3cf88e622d52.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* sparc.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/supplements/sparc/ChangeLog4
-rw-r--r--doc/supplements/sparc/sparc.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/sparc/ChangeLog b/doc/supplements/sparc/ChangeLog
index 84477cb93f..e4551499fa 100644
--- a/doc/supplements/sparc/ChangeLog
+++ b/doc/supplements/sparc/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * sparc.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/sparc/sparc.texi b/doc/supplements/sparc/sparc.texi
index a5defe58e0..2ed4c3ab1c 100644
--- a/doc/supplements/sparc/sparc.texi
+++ b/doc/supplements/sparc/sparc.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements