[kaffe] CVS kaffe (guilhem): Removed conflicts.
Kaffe CVS
cvs-commits at kaffe.org
Sat May 1 23:36:11 PDT 2004
PatchSet 4717
Date: 2004/05/02 05:56:46
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Removed conflicts.
Members:
ChangeLog:1.2291->1.2292
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2291 kaffe/ChangeLog:1.2292
--- kaffe/ChangeLog:1.2291 Sun May 2 05:56:03 2004
+++ kaffe/ChangeLog Sun May 2 05:56:46 2004
@@ -54,7 +54,6 @@
* javax/naming/CompoundName.java (endsWith): Look at correct
element of source name.
->>>>>>> 1.2290
2004-04-28 Dalibor Topic <robilad at kaffe.org>
* configure.ac:
More information about the kaffe
mailing list