summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:19 +0000
commited011c913b054f2c443fa532cf016511673baef3 (patch)
treeaaa17e8d681d5866fd8ec6ca124f96d75f885cb5
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-ed011c913b054f2c443fa532cf016511673baef3.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* new_chapters.texi: Merge from branch.
Diffstat (limited to '')
-rw-r--r--doc/new_chapters/ChangeLog4
-rw-r--r--doc/new_chapters/new_chapters.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/new_chapters/ChangeLog b/doc/new_chapters/ChangeLog
index e827c01b39..8b1cad5313 100644
--- a/doc/new_chapters/ChangeLog
+++ b/doc/new_chapters/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * new_chapters.texi: Merge from branch.
+
2003-01-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* new_chapters.texi: Set @setfilename new_chapters.info.
diff --git a/doc/new_chapters/new_chapters.texi b/doc/new_chapters/new_chapters.texi
index 49ad7a1659..b6b0dd7ef0 100644
--- a/doc/new_chapters/new_chapters.texi
+++ b/doc/new_chapters/new_chapters.texi
@@ -27,6 +27,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual