diff make/hotspot_version @ 20762:c2844108a708

Merge
author asaha
date Thu, 23 Oct 2014 12:02:08 -0700
parents f10fe402dfb1 6baea9ff2da1
children d961743b7897 12478c5eb000
line wrap: on
line diff
--- a/make/hotspot_version	Wed Oct 22 11:18:17 2014 -0700
+++ b/make/hotspot_version	Thu Oct 23 12:02:08 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,7 +31,7 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2014
+HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=40