Mon, 29 Jun 2009 12:00:41 -0400
Merge
1.1 --- a/.hgtags Mon Jun 22 09:14:27 2009 -0400 1.2 +++ b/.hgtags Mon Jun 29 12:00:41 2009 -0400 1.3 @@ -36,3 +36,4 @@ 1.4 7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59 1.5 f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60 1.6 e906b16a12a9a63b615898afa5d9673cbd1c5ab8 jdk7-b61 1.7 +65b66117dbd70a493e9644aeb4033cf95a4e3c99 jdk7-b62
2.1 --- a/make/Makefile Mon Jun 22 09:14:27 2009 -0400 2.2 +++ b/make/Makefile Mon Jun 29 12:00:41 2009 -0400 2.3 @@ -106,7 +106,12 @@ 2.4 2.5 SOURCE_LEVEL = 5 2.6 BOOTSTRAP_TARGET_LEVEL = 5 2.7 -TARGET_LEVEL = 6 2.8 + 2.9 +ifdef TARGET_CLASS_VERSION 2.10 + TARGET_LEVEL = $(TARGET_CLASS_VERSION) 2.11 +else 2.12 + TARGET_LEVEL = 6 2.13 +endif 2.14 2.15 ifndef TARGET_JAVA 2.16 TARGET_JAVA = java