/hg/icedtea7: Resolved conflict between merge jdk7u6-b16 and the...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Jul 13 10:48:57 PDT 2012
changeset 7201f060a304 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7201f060a304
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Jul 13 19:50:48 2012 +0200
Resolved conflict between merge jdk7u6-b16 and the fix
7043963: AWT workaround missing for Mutter.
diffstat:
ChangeLog | 8 ++++++++
Makefile.am | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diffs (36 lines):
diff -r 7a7d8d40ae38 -r 7201f060a304 ChangeLog
--- a/ChangeLog Fri Jun 29 20:37:24 2012 +0100
+++ b/ChangeLog Fri Jul 13 19:50:48 2012 +0200
@@ -1,3 +1,11 @@
+2012-07-13 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ Resolved conflict between merge jdk7u6-b16 and the fix
+ 7043963: AWT workaround missing for Mutter.
+ * Makefile.am,
+ (HOTSPOT_CHANGESET): Updated.
+ (HOTSPOT_SHA256SUM): Likewise.
+
2012-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am,
diff -r 7a7d8d40ae38 -r 7201f060a304 Makefile.am
--- a/Makefile.am Fri Jun 29 20:37:24 2012 +0100
+++ b/Makefile.am Fri Jul 13 19:50:48 2012 +0200
@@ -8,7 +8,7 @@
HOTSPOT_CHANGESET = 3359eef69d1e
JAXP_CHANGESET = 411912b74c9c
JAXWS_CHANGESET = d5997e503698
-JDK_CHANGESET = 0f03c3a0bf94
+JDK_CHANGESET = 1e341b69c2f7
LANGTOOLS_CHANGESET = 480d4eb554fc
OPENJDK_CHANGESET = 7f5ea73378df
@@ -16,7 +16,7 @@
HOTSPOT_SHA256SUM = c10b4208b76c1012e91774bc8a29f561fbb4747fb5bbebe3267f3cbaa24b8c5a
JAXP_SHA256SUM = 77de1a8c4ab40652d0cf9c862c543376a877eb9399ad20e653c7103c599640e4
JAXWS_SHA256SUM = 4fdb7a02b9d42fef84a7fb0f2de2b4c15a737a14be93b5de1c5f6d658072cdea
-JDK_SHA256SUM = 9c5790b4e35f52c351900b9e71ce0c81479961a6146cbf6b74ef2a2d3c802fd5
+JDK_SHA256SUM = c8b080004b6e61f66c27a8213ed54840cd5aedc4e141999db7e3e4181bbef1da
LANGTOOLS_SHA256SUM = 6a3995facdaae90fd7c68faa6c8a566825317136a0064892d71a76f5d5f09efe
OPENJDK_SHA256SUM = a426ab622e51d5ca40a7da4af4b42c2c216f7c27b56190df36e3bf7fea8529ca
More information about the distro-pkg-dev
mailing list