diff make/hotspot_version @ 6066:14b0e07ab9a6 hs24-b11

Merge
author amurillo
date Fri, 18 May 2012 14:50:17 -0700
parents 56d1af561395
children 03d61caacd1e
line wrap: on
line diff
--- a/make/hotspot_version	Thu May 17 06:20:23 2012 -0700
+++ b/make/hotspot_version	Fri May 18 14:50:17 2012 -0700
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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 2011
+HOTSPOT_VM_COPYRIGHT=Copyright 2012
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=10
+HS_BUILD_NUMBER=11
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8