X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=CHANGES;h=328b375ed900899557619ae734b58760669f3eae;hb=bc3944722352e96b8dba11337fcd38eb87a4611c;hp=a7e0804fcd22b3e2def3dd4e345d934813831e39;hpb=6b8ce1715b03f71608bca66647080009f2fa7885;p=org.ibex.core.git

diff --git a/CHANGES b/CHANGES
index a7e0804..328b375 100644
--- a/CHANGES
+++ b/CHANGES
@@ -688,3 +688,27 @@
 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
+
+19-Apr megacz gcc.patch: added Brian Alliets gcc patch
+
+19-Apr megacz JS.java, Resources.java: GUT_branch
+
+19-Apr megacz Makefile: added line to apply gcc.patch; updated
+              gcc3.3 to 08-Apr-2003
+
+20-Apr megacz gcc.patch: fixed the patch so it applies properly
+
+22-Apr megacz Lexer.java: added the Lexer for org.xwt.js
+
+24-Apr megacz Makefile, Carbon.cc, Carbon.java: added Carbon
+              skeleton code
+
+24-Apr megacz Carbon.java: bugfix to make it compile
+
+24-Apr megacz Parser.java, Lexer.java: parser
+
+24-Apr david  ByteStream.java, Resources.java, Template.java, XML.java, XMLRPC.java, Vec.java, XML.java, ByteStream.java, Resources.java, Template.java, XML.java, XMLRPC.java, Vec.java, XML.java, ByteStream.java, Resources.java, Template.java, XML.java, XMLRPC.java, Vec.java, XML.java:
+              new xml parser
+