# HG changeset patch
# User asaha
# Date 1387560549 28800
# Node ID e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e
# Parent  25a5a05cc40e8f5c5d0e6ed2c3de6e65179e673f# Parent  ddff10b13587c71e16ff6d14e5d9bb2a095e0023
Merge

diff -r ddff10b13587 -r e5561d89fe8b .hgtags
--- a/.hgtags	Fri Dec 20 07:41:07 2013 -0800
+++ b/.hgtags	Fri Dec 20 09:29:09 2013 -0800
@@ -404,3 +404,4 @@
 fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120
 41f4cad94c581034d4c427d2aaabcc20f26342d0 hs25-b63
 5f07ec8bb982c48567693d3ef8bdfd4bdf1836d4 jdk8-b121
+4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
diff -r ddff10b13587 -r e5561d89fe8b .jcheck/conf
--- a/.jcheck/conf	Fri Dec 20 07:41:07 2013 -0800
+++ b/.jcheck/conf	Fri Dec 20 09:29:09 2013 -0800
@@ -1,1 +1,2 @@
 project=jdk8
+bugids=dup
diff -r ddff10b13587 -r e5561d89fe8b make/hotspot_version
--- a/make/hotspot_version	Fri Dec 20 07:41:07 2013 -0800
+++ b/make/hotspot_version	Fri Dec 20 09:29:09 2013 -0800
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2013
+HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=0
-HS_BUILD_NUMBER=63
+HS_MINOR_VER=5
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8