comparison make/hotspot_version @ 6646:c38f13903fdf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author Doug Simon <doug.simon@oracle.com>
date Mon, 29 Oct 2012 21:10:04 +0100
parents 957c266d8bc5 153776c4cb6f
children e522a00b91aa
comparison
equal deleted inserted replaced
6590:dc5eec61daba 6646:c38f13903fdf
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2012 34 HOTSPOT_VM_COPYRIGHT=Copyright 2012
35 35
36 HS_MAJOR_VER=24 36 HS_MAJOR_VER=24
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=20 38 HS_BUILD_NUMBER=22
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