[Nice-commit] Nice/debian changelog,1.156,1.157

[<ar...@us...>]

Update of /cvsroot/nice/Nice/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv19964/F:/nice/debian

Modified Files:
	changelog 
Log Message:
Make the merge correct.

Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** changelog	30 Apr 2003 21:22:08 -0000	1.156
--- changelog	30 Apr 2003 21:24:32 -0000	1.157
***************
*** 7,12 ****
          equals(that@A) = this.x == that.x;
        }
-   * Compilation does not fail anymore if some classes on the classpath
-     have an invalid bytecode format.
    * In a method implementation, binding the type parameters should now
      be done in front:
--- 7,10 ----