summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:03:17 +0000
commitea15c266a2e6e7d172bdddef8d62dbdee5795e40 (patch)
tree1673f9a4384eac00f5cac50b533d2a4db6a7eb32 /doc
parent7828a1490ee340f43525051290d6a03e826e3f1d (diff)
downloadrtems-ea15c266a2e6e7d172bdddef8d62dbdee5795e40.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* arm.texi: Merge from branch.
Diffstat (limited to '')
-rw-r--r--doc/supplements/arm/ChangeLog4
-rw-r--r--doc/supplements/arm/arm.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/arm/ChangeLog b/doc/supplements/arm/ChangeLog
index 6c5c764ba5..83f8e83398 100644
--- a/doc/supplements/arm/ChangeLog
+++ b/doc/supplements/arm/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * arm.texi: Merge from branch.
+
2003-01-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* arm.texi: Set @setfilename arm.info.
diff --git a/doc/supplements/arm/arm.texi b/doc/supplements/arm/arm.texi
index 635c08601a..32c3dcab18 100644
--- a/doc/supplements/arm/arm.texi
+++ b/doc/supplements/arm/arm.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements