Mercurial > hg > truffle

comparison make/hotspot_version @ 17524:89152779163c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8-b132
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 11:59:32 +0200
parents 02f27ecb4f3a 54f0c207dc35
children 562643f42b65
comparison
equal deleted inserted replaced
17450:45b45f902bed 17524:89152779163c
1 # 1 #
2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2014, 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 2013 34 HOTSPOT_VM_COPYRIGHT=Copyright 2014
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=63 38 HS_BUILD_NUMBER=70
39 39
40 JDK_MAJOR_VER=1 40 JDK_MAJOR_VER=1
41 JDK_MINOR_VER=8 41 JDK_MINOR_VER=8
42 JDK_MICRO_VER=0 42 JDK_MICRO_VER=0
43 43