Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorjmasa
Fri, 27 Jul 2012 21:41:17 -0700
changeset 13339 f8f2cc6553cf
parent 13332 2f94212bcbe3 (diff)
parent 13338 ad6062b5f71d (current diff)
child 13343 044fda116fff
Merge
--- a/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 600c9a1feb01633cbcf2341a43d1d21e6497ecd0 jdk8-b46
 b820143a6f1ce993c6e6f31db4d64de990f42654 jdk8-b47
 086271e35b0a419b38e8bda9bebd70693811df0a jdk8-b48
+cecd7026f30cbd83b0601925a7a5e059aec98138 jdk8-b49
--- a/.hgtags-top-repo	Thu Jul 26 23:43:36 2012 -0700
+++ b/.hgtags-top-repo	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46
 1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47
 3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48
+c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49
--- a/corba/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/corba/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 30141e598d72a6146126cb86b034ed6d0bd191b3 jdk8-b46
 21e46ea21c6a26246fb7a1926ac7fe8d580d0518 jdk8-b47
 7e2b179a5b4dbd3f097e28daa00abfcc72ba3e0b jdk8-b48
+fe44e58a6bdbeae350ce96aafb49770a5dca5d8a jdk8-b49
--- a/hotspot/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/hotspot/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -263,3 +263,5 @@
 66b0450071c1534e014b131892cc86b63f1d009c hs24-b16
 1e26f61bbb521642639f56fae11326f1932f5a7d jdk8-b48
 bd54fe36b5e50f9ef1e30a5047b27fee5297e268 hs24-b17
+e3619706a7253540a2d94e9e841acaab8ace7038 jdk8-b49
+72e0362c3f0cfacbbac8af8a5b9d2e182f21c17b hs24-b18
--- a/hotspot/make/hotspot_version	Thu Jul 26 23:43:36 2012 -0700
+++ b/hotspot/make/hotspot_version	Fri Jul 27 21:41:17 2012 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=18
+HS_BUILD_NUMBER=19
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/jaxp/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/jaxp/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 300f45e990643af230d6cca39477ff62c44a9a54 jdk8-b46
 404521944ac9383afda7d55d60713b212c730646 jdk8-b47
 1c88da9a1365797e49be77ae42c34bbc0a3c3f0c jdk8-b48
+f81e981eca7b63316cf9d778f93903a4fc62161d jdk8-b49
--- a/jaxws/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/jaxws/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 ae368a83c2404b65c9e38c65e2aa081f2201ca74 jdk8-b46
 fe6a060afc404dcf0921708a740de770666b781f jdk8-b47
 efb564de8a8ee397a65fab77d45cb20200f6ddd8 jdk8-b48
+b48865af8ac559ba6f60fb86fa3fe0ebdd22746c jdk8-b49
--- a/jdk/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/jdk/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 8d2ed9d58453c8049715a72a6d26b6b66b37a94c jdk8-b46
 00b22b23269a57d0bb46c57753be2fe9a9d2c1a3 jdk8-b47
 3e4ab821f46166fcf63e8fe5c8046216003c941f jdk8-b48
+51707c3b75c0f521794d9ab425f4e5b2351c70c1 jdk8-b49
--- a/langtools/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/langtools/.hgtags	Fri Jul 27 21:41:17 2012 -0700
@@ -170,3 +170,4 @@
 4ca5994971724731233735f055f33d4936fd11d3 jdk8-b46
 7e6be2f239c9a4ac6dec280bd18ec296dd78e464 jdk8-b47
 afb0a523155727d42b1c773f783ff3a7cfab8e86 jdk8-b48
+c72c164ced676d3c360d99b1c52cc80940fc3122 jdk8-b49
jdk-sandbox