summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2007-01-27 07:29:30 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2007-01-27 07:29:30 +0000
commite979fc841f80df58e4cb9cf23c86cab7ea8c5a89 (patch)
tree3b234dff0868310878de90e103248c24ab85dd0f /cpukit
parent2007-01-27 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-e979fc841f80df58e4cb9cf23c86cab7ea8c5a89.tar.bz2
Fix typos.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 72efc119a2..4a2f88accc 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -51,7 +51,6 @@
* libnetworking/rtems/rtems_glue.c: Remove local
extern strdup.
->>>>>>> 1.696.2.26
2006-12-08 Ralf Corsépius <ralf.corsepius@rtems.org>
* libcsupport/include/rtems/libio.h, libcsupport/src/read.c,