summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-10-16 16:04:48 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-10-16 16:04:48 +0000
commit879f1e469db57cd480bb33ff91340ad1a5be2bff (patch)
treee4ade8f9863ad4e7e6ba1199f1efb5a8f97a196b
parent2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-879f1e469db57cd480bb33ff91340ad1a5be2bff.tar.bz2
Fix broken file
-rw-r--r--cpukit/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6135df2e4d..17121940e7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -82,7 +82,6 @@
libmisc/stackchk/stackchk.h: Move stack to first class citizen
status. Include it in User Manual and rename to start with rtems_.
->>>>>>> 1.705
2006-09-11 Joel Sherrill <joel@OARcorp.com>
* libmisc/mw-fb/mw_fb.c, libmisc/mw-fb/mw_fb.h, libmisc/mw-fb/mw_uid.c,