comparison make/hotspot_version @ 6152:958bb4b7be49

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents bc8881f974b8
children e02867d10860
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
31 # 31 #
32 32
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=24
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=11 38 HS_BUILD_NUMBER=06
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