Merge
authorduke
Wed, 05 Jul 2017 16:57:44 +0200
changeset 3355 6f0092ba6fed
parent 3354 a02edc83f1b4 (current diff)
parent 3309 e795521586a2 (diff)
child 3360 bd50f2e84c17
Merge
--- a/.hgtags-top-repo	Wed Aug 05 11:06:46 2009 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 16:57:44 2017 +0200
@@ -41,3 +41,4 @@
 269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
+c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
--- a/hotspot/.hgtags	Wed Aug 05 11:06:46 2009 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 16:57:44 2017 +0200
@@ -41,3 +41,4 @@
 ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
+18f526145aea355a9320b724373386fc2170f183 jdk7-b67
--- a/make/README.pre-components	Wed Aug 05 11:06:46 2009 -0700
+++ b/make/README.pre-components	Wed Jul 05 16:57:44 2017 +0200
@@ -18,7 +18,7 @@
   ALT_LANGTOOLS_DIST    The dist area from a langtools build to use, if provided
   ALT_OUTPUTDIR         Parent dir of build and dist directories, if provided
   VARIANT               If DBG, debug build, if OPT, optimized build
-  TARGET_CLASS_VERSION  The classfile version number (currently 5)
+  TARGET_CLASS_VERSION  The classfile version number (currently 7)
   ANT_HOME              Home of ant to use, if provided
   QUIET                 If defined, be quiet
   VERBOSE               If defined, be verbose