Resolve classpath ChangeLog merge conflict.
authorMark Wielaard <mark@gcc.gnu.org>
Sat, 4 Feb 2006 17:33:46 +0000 (17:33 +0000)
committerMark Wielaard <mark@gcc.gnu.org>
Sat, 4 Feb 2006 17:33:46 +0000 (17:33 +0000)
commitdd4ebf6ae9d708b231ad929bbe6fa900fb336a02
tree581215c7a95d9cf7290538512481b85d053ee17e
parent10f3742b1103aa2840c74719a4791b337e2fa0f7
Resolve classpath ChangeLog merge conflict.

From-SVN: r110591
libjava/classpath/ChangeLog