summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-09-19 18:04:22 +0000
commit397bff45f08a99a3900fcea6fa2fc66d801c9d66 (patch)
tree4ee099fe1859e3c38f5edb9baf2790f639d70e5d /doc
parented011c913b054f2c443fa532cf016511673baef3 (diff)
downloadrtems-397bff45f08a99a3900fcea6fa2fc66d801c9d66.tar.bz2
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* porting.texi: Merge from branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/porting/ChangeLog4
-rw-r--r--doc/porting/porting.texi1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/porting/ChangeLog b/doc/porting/ChangeLog
index 963f6b9077..16a17809af 100644
--- a/doc/porting/ChangeLog
+++ b/doc/porting/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-19 Joel Sherrill <joel@OARcorp.com>
+
+ * porting.texi: Merge from branch.
+
2003-08-22 Joel Sherrill <joel@OARcorp.com>
* cpumodels.t, sourcecode.t: Reconcile differences between CVS trunk
diff --git a/doc/porting/porting.texi b/doc/porting/porting.texi
index ebf7c796d6..53386ce0af 100644
--- a/doc/porting/porting.texi
+++ b/doc/porting/porting.texi
@@ -27,6 +27,7 @@
@include version.texi
@include common/setup.texi
+@include common/rtems.texi
@ifset use-ascii
@dircategory RTEMS On-Line Manual