changeset 5134:ea7a324102bf

Merge
author asaha
date Mon, 23 Apr 2012 13:23:28 -0700
parents 6ccd627b4af2 42ca70fcb2ce
children 538f6eff4041
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 12 15:53:35 2012 -0700
+++ b/.hgtags	Mon Apr 23 13:23:28 2012 -0700
@@ -166,3 +166,5 @@
 084825fc677ef6adecab9400a2625eb0e5579509 jdk7u4-b18
 0f9aacb27534e7bba7ba30a2700a9c828416929d jdk7u4-b19
 1a495432b42a496bde0ddfa16c6462742d7a8cf1 jdk7u4-b20
+81a0f71a895e7f386efdd481eb53fb3ca0597438 jdk7u4-b30
+0573d282ca247a2848c26fe2800c7f3aa8d2e882 jdk7u4-b21
--- a/make/common/Release-macosx.gmk	Thu Apr 12 15:53:35 2012 -0700
+++ b/make/common/Release-macosx.gmk	Mon Apr 23 13:23:28 2012 -0700
@@ -35,8 +35,8 @@
 MACOSX_SRC	 = $(JDK_TOPDIR)/src/macosx
 
 BUNDLE_ID ?= net.java.openjdk
-BUNLDE_ID_JRE ?= $(BUNDLE_ID).jre
-BUNLDE_ID_JDK ?= $(BUNDLE_ID).jdk
+BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre
+BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk
 
 BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION)
 BUNDLE_NAME_JRE ?= $(BUNDLE_NAME)