comparison make/hotspot_version @ 11065:cedf20e2a655

Merge
author coleenp
date Tue, 02 Jul 2013 16:54:24 +0200
parents 8c4424890028
children ea4d24c1e0c6
comparison
equal deleted inserted replaced
11064:de2d15ce3d4a 11065:cedf20e2a655
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=37 38 HS_BUILD_NUMBER=40
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