changeset 3609:ff58dfd5b977

Merge
author jmasa
date Fri, 27 Jul 2012 21:41:17 -0700
parents 86a687be3f02 (diff) 3080f4743cf2 (current diff)
children e37a5219e297
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 26 23:43:36 2012 -0700
+++ b/.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/make/hotspot_version	Thu Jul 26 23:43:36 2012 -0700
+++ b/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