comparison make/hotspot_version @ 11995:9064e3a19525

Merge
author hseigel
date Mon, 05 Aug 2013 08:55:06 -0700
parents 79ce055063e9
children 39127bb12d32
comparison
equal deleted inserted replaced
11994:b67604b59546 11995:9064e3a19525
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 2013
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=43 38 HS_BUILD_NUMBER=45
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