changeset 6308:fcef32387025

Merge
author coleenp
date Sat, 21 Jun 2014 01:56:29 +0000
parents fc25d8f6c466 0be2b9eb0a62
children 5d855d021755
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jun 20 10:48:36 2014 -0400
+++ b/.hgtags	Sat Jun 21 01:56:29 2014 +0000
@@ -474,3 +474,5 @@
 b685b4e870b159ea5731984199d275879d427038 hs25.20-b18
 11159d7ec80462a422e39c9b3a39ae932923622d jdk8u20-b18
 3e1cec358ab95ef985f821219104141b9ffda83f hs25.20-b19
+b15553cde967dfd7781a4a5c669e4cb7db734317 jdk8u20-b19
+4f18dea0312d601d0515976bc0c643ea7acc829d hs25.20-b20
--- a/make/hotspot_version	Fri Jun 20 10:48:36 2014 -0400
+++ b/make/hotspot_version	Sat Jun 21 01:56:29 2014 +0000
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=20
-HS_BUILD_NUMBER=20
+HS_BUILD_NUMBER=21
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8