comparison make/hotspot_version @ 3857:40e5a3f2907e

Merge
author amurillo
date Fri, 29 Jun 2012 17:04:39 -0700
parents 6e2633440960
children bcffa4c5eef6
comparison
equal deleted inserted replaced
193:e3ef61205360 194:400869b615cd
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2012 34 HOTSPOT_VM_COPYRIGHT=Copyright 2012
35 35
36 HS_MAJOR_VER=24 36 HS_MAJOR_VER=24
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=14 38 HS_BUILD_NUMBER=15
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