summaryrefslogtreecommitdiffstats
path: root/doc/supplements
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:11 +0000
commit470a44ce4f2521810eb1ad1918106e6ef30a9d72 (patch)
tree29744895fa711f5d0098eb088c08491fdcd6c073 /doc/supplements
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-470a44ce4f2521810eb1ad1918106e6ef30a9d72.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* hppa1_1.texi: Merge from branch.
Diffstat (limited to 'doc/supplements')
-rw-r--r--doc/supplements/hppa1_1/ChangeLog4
-rw-r--r--doc/supplements/hppa1_1/hppa1_1.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/hppa1_1/ChangeLog b/doc/supplements/hppa1_1/ChangeLog
index 17e6b1bd5c..7ed3760f5c 100644
--- a/doc/supplements/hppa1_1/ChangeLog
+++ b/doc/supplements/hppa1_1/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * hppa1_1.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/hppa1_1/hppa1_1.texi b/doc/supplements/hppa1_1/hppa1_1.texi
index e799d7e4cd..d321b4c53a 100644
--- a/doc/supplements/hppa1_1/hppa1_1.texi
+++ b/doc/supplements/hppa1_1/hppa1_1.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements