summaryrefslogtreecommitdiffstats
path: root/doc/networking
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
commitbcdaffdf50895c349fd3fd6a702c2ac481ba7177 (patch)
tree233c6eda15548c65dfa574f3faecb064ba7bfc00 /doc/networking
parent2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-bcdaffdf50895c349fd3fd6a702c2ac481ba7177.tar.bz2
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to '')
-rw-r--r--doc/networking/ChangeLog4
-rw-r--r--doc/networking/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/networking/ChangeLog b/doc/networking/ChangeLog
index 11477a322d..7778f3894c 100644
--- a/doc/networking/ChangeLog
+++ b/doc/networking/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merger from rtems-4-6-branch.
+
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* networking.texi: Merge from branch.
diff --git a/doc/networking/Makefile.am b/doc/networking/Makefile.am
index 38163707e1..84af3a7e23 100644
--- a/doc/networking/Makefile.am
+++ b/doc/networking/Makefile.am
@@ -18,8 +18,7 @@ BMENU2 += -c
GENERATED_FILES = networkapp.texi driver.texi networktasks.texi testing.texi \
servers.texi decdriver.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
FILES = networktasks.texi preface.texi