X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=CHANGES;h=4a3f8cbbbb60b3f85af90c83e265946214187dc8;hb=53a0f375b3481faea0bee95af14204e1c5ed0933;hp=a7e0804fcd22b3e2def3dd4e345d934813831e39;hpb=798082a9cf2856f50f91483da37b5d9661355f00;p=org.ibex.core.git

diff --git a/CHANGES b/CHANGES
index a7e0804..4a3f8cb 100644
--- 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
+