comparison make/hotspot_version @ 20783:4b41145051ab

Merge
author asaha
date Fri, 12 Dec 2014 09:37:54 -0800
parents 9b4d6de0a838 dcccfe952e9b
children c4f1e23c4139 41c3c456e326
comparison
equal deleted inserted replaced
20782:9b4d6de0a838 20783:4b41145051ab
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2015 34 HOTSPOT_VM_COPYRIGHT=Copyright 2015
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=40 37 HS_MINOR_VER=40
38 HS_BUILD_NUMBER=21 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