diff options
| author | Mark Wielaard <mark@klomp.org> | 2005-04-26 00:21:12 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2005-04-26 00:21:12 +0000 |
| commit | 9b8e5578059cda0ac736b4713fed638cd5662a0e (patch) | |
| tree | 9785f85d82cdb756f75df7d77c6e8415b983716a /ChangeLog | |
| parent | b2722d2d83271e6afc995c271862141dfa950e0a (diff) | |
| download | classpath-9b8e5578059cda0ac736b4713fed638cd5662a0e.tar.gz | |
Remove conflict marker.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ -2005-04-24 Mark Wielaard <mark@klomp.org> +2005-04-25 Mark Wielaard <mark@klomp.org> * iconv.m4: New file. * configure.ac: Use AM_ICONV. @@ -112,7 +112,6 @@ * native/fdlibm/ieeefp.h: ppc64 is also __IEEE_BIG_ENDIAN. ->>>>>>> 1.3514 2005-04-23 Tom Tromey <tromey@redhat.com> * javax/swing/text/StyleConstants.java (StyleConstants): Now |