# HG changeset patch
# User asaha
# Date 1413311933 25200
# Node ID d25a7e8695dce5a9f7f11faca0bd42ee13350bde
# Parent  22ac20a25842eac3c3349411f5abdddf25275e7e# Parent  e0918820dac1944d8bb165bfaa1d25942b7afc84
Merge

diff -r e0918820dac1 -r d25a7e8695dc .hgtags
--- a/.hgtags	Mon Oct 13 12:31:41 2014 -0700
+++ b/.hgtags	Tue Oct 14 11:38:53 2014 -0700
@@ -528,3 +528,4 @@
 087678da96603c9705b38b6cc4a6569ac7b4420a jdk8u31-b02
 401cbaa475b4efe53153119ab87a82b217980a7f jdk8u31-b03
 060cdf93040c1bfa5fdf580da5e9999042632cc8 jdk8u31-b04
+b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
diff -r e0918820dac1 -r d25a7e8695dc make/hotspot_version
--- a/make/hotspot_version	Mon Oct 13 12:31:41 2014 -0700
+++ b/make/hotspot_version	Tue Oct 14 11:38:53 2014 -0700
@@ -34,7 +34,7 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=31
+HS_MINOR_VER=45
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1