diff options
| author | Robert Schuster <theBohemian@gmx.net> | 2006-06-16 12:37:04 +0000 |
|---|---|---|
| committer | Robert Schuster <theBohemian@gmx.net> | 2006-06-16 12:37:04 +0000 |
| commit | 6587f111bb2807143ec95ab00b271ce5f9fe3345 (patch) | |
| tree | 2c0c0d8e409f61d332e0a7fe29cf89e3450ec779 | |
| parent | 24dc722bcc37ab04baafe72ec62a47e7b51d7732 (diff) | |
| download | classpath-6587f111bb2807143ec95ab00b271ce5f9fe3345.tar.gz | |
Removed CVS' conflict indicators.
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |