changeset 111:669ca01f0e1d

. Merge in changes from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Sun, 28 Jun 2009 18:33:59 -0700
parents d7c50a83ba94 d20e45cd539f
children 85a5e1f3708a
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jun 12 15:53:53 2009 -0400
+++ b/.hgtags	Sun Jun 28 18:33:59 2009 -0700
@@ -34,3 +34,6 @@
 972c6157fae57850694675da82fd58a17930db0a jdk7-b57
 2e3b8edab3ef55406494d3dd562e06882e6fc15e jdk7-b58
 7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59
+f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60
+e906b16a12a9a63b615898afa5d9673cbd1c5ab8 jdk7-b61
+65b66117dbd70a493e9644aeb4033cf95a4e3c99 jdk7-b62
--- a/make/Makefile	Fri Jun 12 15:53:53 2009 -0400
+++ b/make/Makefile	Sun Jun 28 18:33:59 2009 -0700
@@ -106,7 +106,12 @@
 
 SOURCE_LEVEL = 5
 BOOTSTRAP_TARGET_LEVEL = 5
-TARGET_LEVEL = 6
+
+ifdef TARGET_CLASS_VERSION
+    TARGET_LEVEL = $(TARGET_CLASS_VERSION)
+else
+    TARGET_LEVEL = 6
+endif
 
 ifndef TARGET_JAVA
   TARGET_JAVA = java