Mercurial > hg > release > icedtea6-1.9

changeset 2292:16d45ce7afaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Apply 7002666 to both hs17 and hs19. 2010-12-01 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Apply 7002666 to both hs17 and hs19.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 01 Dec 2010 19:56:08 +0000
parents 63366753f9ba
children d24b71a3a8fe
files ChangeLog Makefile.am
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Dec 01 18:41:42 2010 +0000
+++ b/ChangeLog	Wed Dec 01 19:56:08 2010 +0000
@@ -1,3 +1,8 @@
+2010-12-01  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Apply 7002666 to both hs17
+	and hs19.
+
 2010-12-01  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/hotspot/hs19/ia64-fix.patch: Reapply chunk from
--- a/Makefile.am	Wed Dec 01 18:41:42 2010 +0000
+++ b/Makefile.am	Wed Dec 01 19:56:08 2010 +0000
@@ -316,12 +316,12 @@
 	patches/openjdk/6850606-bigdecimal_regression.patch \
 	patches/openjdk/6876282-bigdecimal_divide.patch \
 	patches/f14-fonts.patch \
-	patches/applet_hole.patch
+	patches/applet_hole.patch \
+	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/openjdk/6994130-ppc_fix.patch \
-	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
 	patches/hotspot/hs19/ia64-fix.patch
 else
 ICEDTEA_PATCHES += \