/hg/icedtea6: Apply 7002666 to both hs17 and hs19.

[andrew at icedtea.classpath.org]

changeset 6bc8c41e508f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6bc8c41e508f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 01 17:53:39 2010 +0000

	Apply 7002666 to both hs17 and hs19.

	2010-12-01 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Apply 7002666 to both hs17 and hs19.


diffstat:

2 files changed, 7 insertions(+), 2 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    4 ++--

diffs (30 lines):

diff -r 9f9f4d8947e1 -r 6bc8c41e508f ChangeLog
--- a/ChangeLog	Wed Dec 01 15:57:49 2010 +0000
+++ b/ChangeLog	Wed Dec 01 17:53:39 2010 +0000
@@ -1,3 +1,8 @@ 2010-12-01  Andrew John Hughes  <ahughes
+2010-12-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Apply 7002666 to both hs17
+	and hs19.
+
 2010-12-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/disable-default-compoops.patch: Removed.
diff -r 9f9f4d8947e1 -r 6bc8c41e508f Makefile.am
--- a/Makefile.am	Wed Dec 01 15:57:49 2010 +0000
+++ b/Makefile.am	Wed Dec 01 17:53:39 2010 +0000
@@ -302,12 +302,12 @@ ICEDTEA_PATCHES = \
 	patches/f14-fonts.patch \
 	patches/jtreg-DeleteFont.patch \
 	patches/jtreg-WindowWithWarningTest.patch \
-	patches/jtreg-T6638712-fix.patch
+	patches/jtreg-T6638712-fix.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/openjdk/6980392-fix_test6581734.patch \
 	patches/hotspot/hs19/ia64-fix.patch
 else