summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 0 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bd993a36..4a832790d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -162,7 +162,6 @@
Added serialization UID and changed to extend
javax.management.JMException.
->>>>>>> 1.7826
2006-06-14 Lillian Angel <langel@redhat.com>
* java/awt/Component.java
@@ -341,7 +340,6 @@
compatibility with filters.
(getParameter): Modified to allow access to above.
->>>>>>> 1.7824
2006-06-13 Sven de Marothy <sven@physto.se>
* gnu/java/awt/peer/gtk/CairoSurface.java
@@ -363,7 +361,6 @@
or not the labels are visible,
(paintTrack): Shift track down one pixel.
->>>>>>> 1.7799
2006-06-13 Lillian Angel <langel@redhat.com>
* java/awt/image/PixelGrabber.java
@@ -1134,7 +1131,6 @@
(TreeIncrementAction.actionPerformed): Use action name as command.
(TreeIncrementAction.isEnabled): Implemented.
->>>>>>> 1.7796
2006-06-08 Mark Wielaard <mark@klomp.org>
PR 27917