diff options
Diffstat (limited to 'libjava/ChangeLog')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a4c80c9c3d2..8ad2f81c8b7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -98,7 +98,6 @@ * jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter. Pass millis to _Jv_CondWait. ->>>>>>> .r116849 2006-08-31 Tom Tromey <tromey@redhat.com> PR libgcj/28698: |
