comparison make/hotspot_version @ 5859:502c24b2ffae

Merge
author asaha
date Mon, 16 Feb 2015 10:52:53 -0800
parents fa53911cba48 0c899469e2cd
children e22137065c4c
comparison
equal deleted inserted replaced
362:8617ccddcc98 364:3c28f9678e5e
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=24 36 HS_MAJOR_VER=24
37 HS_MINOR_VER=80 37 HS_MINOR_VER=80
38 HS_BUILD_NUMBER=10 38 HS_BUILD_NUMBER=11
39 39
40 JDK_MAJOR_VER=1 40 JDK_MAJOR_VER=1
41 JDK_MINOR_VER=7 41 JDK_MINOR_VER=7
42 JDK_MICRO_VER=0 42 JDK_MICRO_VER=0
43 43