[gui][patch] merge from trunk to branch

graydon hoare graydon@redhat.com
Thu Jun 24 06:21:00 GMT 2004


hi,

I just made a large-ish merge from trunk -> java-gui-branch. hopefully 
all went well. since there were a lot of "echoes" from the other 
direction (branch -> trunk) I tool the liberty of reformatting the 
Changelog through a uniquification filter, on the branch. if you really 
dislike this you can change it back, but it seems to make it more sensible.

this is the "small" version of the update, which involved moving the 
branch tags on all unchanged files outside libjava, and doing -j -j 
update within libjava. it's still 2mb of diffs.

the patch is here for your viewing:

http://people.redhat.com/graydon/java-gui-update-20040619.patch

changelog attached. doing more test cycles now, but this is on the 
branch so hopefully only the gui team is affected. let me know if you 
have any difficulties with it.

-graydon
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: unified-changelog
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20040624/23826387/attachment.ksh>


More information about the Java-patches mailing list