2003/04/20 06:30:21

darcs-hash:20040130065900-2ba56-5f2eb96b3ba864cc5189ac4e4e85278e73da7e8d.gz

diff --git a/CHANGES b/CHANGES
index a7e0804..4a3f8cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -688,3 +688,6 @@
 19-Apr megacz Makefile, Makefile, jmorecfg.h.patch, jpegsrc.v6b.tar.gz, Box.java, HTTP.java, Platform.java, Resources.java, AWT.java, GCJ.cc, GCJ.java, Win32.cc, X11.cc:
               merged in HEAD
 
+19-Apr megacz Makefile, Main.java, Platform.java, Darwin.cc, Darwin.java, GCJ.cc, GCJ.java, Linux.java, POSIX.cc, Win32.cc, X11.cc:
+              merge from Darwin branch
+