comparison make/hotspot_version @ 13041:04df110c8655

Merge
author mgronlun
date Sat, 02 Nov 2013 20:56:18 +0100
parents 5b84039ca739
children 20c72bec2707
comparison
equal deleted inserted replaced
13040:f8b56489e455 13041:04df110c8655
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=57 38 HS_BUILD_NUMBER=58
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