comparison make/hotspot_version @ 12914:ca9029490fce

Merge
author chegar
date Thu, 25 Jul 2013 17:35:33 +0100
parents bd1dc81da579
children 2285b4a0a4e6
comparison
equal deleted inserted replaced
12913:7ec210434b3c 12914:ca9029490fce
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=41 38 HS_BUILD_NUMBER=42
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