PatchSet 3942
Date: 2003/08/13 14:53:47
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Removed conflict remainings...
Members:
ChangeLog:1.1544->1.1545
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1544 kaffe/ChangeLog:1.1545
--- kaffe/ChangeLog:1.1544 Wed Aug 13 06:52:17 2003
+++ kaffe/ChangeLog Wed Aug 13 06:53:47 2003
@@ -117,7 +117,6 @@
Made $JAVA dependent upon $KAFFEHOME to ensure that the
correct kaffe binary is used during make check.
->>>>>>> 1.1543
2003-08-12 Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/clib/native/RMIHashes.c: copied back
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
