Mercurial > hg > truffle

changeset 20727:6e7f1382ca62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coffeys
date Fri, 01 Aug 2014 11:04:42 +0100
parents 1c198f9c8854 (diff) 9e2bb00a8191 (current diff)
children 31845bc861c5
files .hgtags make/hotspot_version
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Aug 01 10:16:39 2014 +0100
+++ b/.hgtags	Fri Aug 01 11:04:42 2014 +0100
@@ -512,3 +512,4 @@
 f3f50c4f9ea5d3af40cb794b6f3f2a337c8873db jdk8u25-b08
 4f209b7a580c78bac255e69f4724c42584c32a7d jdk8u25-b09
 19c692f1e4c571a9285e33e7d3d15948769fcbdd jdk8u25-b10
+5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
--- a/make/hotspot_version	Fri Aug 01 10:16:39 2014 +0100
+++ b/make/hotspot_version	Fri Aug 01 11:04:42 2014 +0100
@@ -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