summaryrefslogtreecommitdiffstats
path: root/doc/supplements/template
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:34 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:02:34 +0000
commit2b643701c7e09df46b3f0acce8d0c379becf970e (patch)
tree04e61e38f6c364654d5650fca2f21cf362c74bee /doc/supplements/template
parent2003-09-19 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-2b643701c7e09df46b3f0acce8d0c379becf970e.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* template.texi: Merge from branch.
Diffstat (limited to 'doc/supplements/template')
-rw-r--r--doc/supplements/template/ChangeLog4
-rw-r--r--doc/supplements/template/template.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/supplements/template/ChangeLog b/doc/supplements/template/ChangeLog
index e052eb5318..60f2411d4f 100644
--- a/doc/supplements/template/ChangeLog
+++ b/doc/supplements/template/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * template.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/template/template.texi b/doc/supplements/template/template.texi
index 9729a02942..a2b655fd63 100644
--- a/doc/supplements/template/template.texi
+++ b/doc/supplements/template/template.texi
@@ -21,6 +21,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS Target Supplements