comparison make/hotspot_version @ 12020:7b03590c334b

Merge
author dcubed
date Fri, 09 Aug 2013 15:36:09 -0700
parents 39127bb12d32
children 3cce976666d9 37165c3618a3
comparison
equal deleted inserted replaced
12018:98aa538fd97e 12020:7b03590c334b
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2013 34 HOTSPOT_VM_COPYRIGHT=Copyright 2013
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=45 38 HS_BUILD_NUMBER=46
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