comparison make/hotspot_version @ 13418:9fc985481d78

Merge
author ehelin
date Mon, 02 Dec 2013 15:43:04 +0100
parents b6b9a5d4cda0
children 3aa20cee331a 4a35ef38e2a7
comparison
equal deleted inserted replaced
13417:55a0da3d420b 13418:9fc985481d78
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=61 38 HS_BUILD_NUMBER=62
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