Mercurial > hg > graal-jvmci-8
comparison make/hotspot_version @ 20762:c2844108a708
Merge
author | asaha |
---|---|
date | Thu, 23 Oct 2014 12:02:08 -0700 |
parents | f10fe402dfb1 6baea9ff2da1 |
children | d961743b7897 12478c5eb000 |
comparison
equal
deleted
inserted
replaced
20550:8538a606a105 | 20762:c2844108a708 |
---|---|
1 # | 1 # |
2 # Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
29 # workspace build. This file format must remain compatible with both | 29 # workspace build. This file format must remain compatible with both |
30 # GNU Makefile and Microsoft nmake formats. | 30 # GNU Makefile and Microsoft nmake formats. |
31 # | 31 # |
32 | 32 |
33 # Don't put quotes (fail windows build). | 33 # Don't put quotes (fail windows build). |
34 HOTSPOT_VM_COPYRIGHT=Copyright 2014 | 34 HOTSPOT_VM_COPYRIGHT=Copyright 2015 |
35 | 35 |
36 HS_MAJOR_VER=25 | 36 HS_MAJOR_VER=25 |
37 HS_MINOR_VER=40 | 37 HS_MINOR_VER=40 |
38 HS_BUILD_NUMBER=15 | 38 HS_BUILD_NUMBER=15 |
39 | 39 |