diff options
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6c6bea8b..a7b1a17 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -674,7 +674,6 @@ * include/i386-signal.h (MAKE_THROW_FRAME): Ditto. * include/ppc-signal.h: New file. ->>>>>>> 1.385 2000-05-18 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/Thread.java: Declare `data' as Object, not RawData. |