Mercurial > hg > truffle

changeset 20724:9826742fa96a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 14 Jul 2014 07:41:47 -0700
parents 6366f612ac2c (diff) ccfff14361ea (current diff)
children 341af2f08515
files .hgtags make/hotspot_version
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 10 16:01:11 2014 -0700
+++ b/.hgtags	Mon Jul 14 07:41:47 2014 -0700
@@ -502,3 +502,4 @@
 220eefb3609e250a0bb0ed26236c1213b8000050 jdk8u25-b04
 db8383148bc9417dd4c38fa4cea39510f17325f3 jdk8u25-b05
 605df8463453628df49351fa63632666f18698cd jdk8u25-b06
+5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
--- a/make/hotspot_version	Thu Jul 10 16:01:11 2014 -0700
+++ b/make/hotspot_version	Mon Jul 14 07:41:47 2014 -0700
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, 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,10 +31,10 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2014
+HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=25
+HS_MINOR_VER=31
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1