summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:41 +0000
commitfedfa4af7b7a0fc01e8a179b5ac6ce5189d00f97 (patch)
tree2d21e6dc09fccc54a75dc824e9eb8b85685dadea
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-fedfa4af7b7a0fc01e8a179b5ac6ce5189d00f97.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* develenv.texi, direct.t, sample.t, utils.t: Merge from branch.
Diffstat (limited to '')
-rw-r--r--doc/develenv/ChangeLog4
-rw-r--r--doc/develenv/develenv.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/develenv/ChangeLog b/doc/develenv/ChangeLog
index 69c6309e84..6ccbeb39d3 100644
--- a/doc/develenv/ChangeLog
+++ b/doc/develenv/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * develenv.texi, direct.t, sample.t, utils.t: Merge from branch.
+
2003-04-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* develenv.texi: Fix @setfilename to develenv.info.
diff --git a/doc/develenv/develenv.texi b/doc/develenv/develenv.texi
index 47fba4168c..2416b5bd6a 100644
--- a/doc/develenv/develenv.texi
+++ b/doc/develenv/develenv.texi
@@ -27,6 +27,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual