[commit-cp] classpath ChangeLog

[Audrius Meskauskas]

CVSROOT:        /sources/classpath
Module name:    classpath
Branch:         
Changes by:     Audrius Meskauskas <[EMAIL PROTECTED]>  06/03/30 18:24:45

Modified files:
        .              : ChangeLog 

Log message:
        2006-03-30  Audrius Meskauskas  <[EMAIL PROTECTED]>
        
        Changelog: Fixed 2006-03-17 wrongly resolved conflict.
        See 
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6794&tr2=1.6795&r1=text&r2=text

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6949&tr2=1.6950&r1=text&r2=text