diff options
| -rw-r--r-- | cpukit/ChangeLog | 1 |
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, |