comparison make/hotspot_version @ 4954:f92a171cf007

Merge
author amurillo
date Fri, 17 Feb 2012 15:06:38 -0800
parents 094138495da4
children 4ab89de75552
comparison
equal deleted inserted replaced
4953:087daaec688d 4954:f92a171cf007
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2011 34 HOTSPOT_VM_COPYRIGHT=Copyright 2011
35 35
36 HS_MAJOR_VER=23 36 HS_MAJOR_VER=23
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=15 38 HS_BUILD_NUMBER=16
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