Mercurial > hg > release > icedtea6-1.12
changeset 2715:080e299556a0
merge
| author | aph |
|---|---|
| date | Wed, 26 Oct 2011 13:10:04 -0400 |
| parents | fd72f69cc3e9 |
| children | 68d8fd484caa |
| files | ChangeLog |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 19 12:37:40 2011 -0400 +++ b/ChangeLog Wed Oct 26 13:10:04 2011 -0400 @@ -1,15 +1,4 @@ -2011-10-21 Andrew John Hughes <ahughes@redhat.com> - - * patches/security/20111018/7083012.patch: - Remove testcases not in upstream version. - -2011-10-19 Andrew John Hughes <ahughes@redhat.com> - - * Makefile.am: Move jtregcheck from - clean-local to .PHONY where it's supposed - to be (bad patch program!) - -2011-09-15 Andrew Haley <aph@redhat.com> +2011-10-26 Andrew Haley <aph@redhat.com> Reinstate the ARM assembler port. Back out this patch: @@ -28,6 +17,17 @@ * arm_port/hotspot/tools/mkbc.c: Likewise. * patches/arm.patch: Likewise. +2011-10-21 Andrew John Hughes <ahughes@redhat.com> + + * patches/security/20111018/7083012.patch: + Remove testcases not in upstream version. + +2011-10-19 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: Move jtregcheck from + clean-local to .PHONY where it's supposed + to be (bad patch program!) + 2011-10-14 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add patches.