comparison make/hotspot_version @ 20771:9fa3bf3043a2

Merge
author asaha
date Wed, 26 Nov 2014 08:14:21 -0800
parents 02c7eebe5f52 84e11eeec136
children 42f27b59c550
comparison
equal deleted inserted replaced
20770:02c7eebe5f52 20771:9fa3bf3043a2
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2015 34 HOTSPOT_VM_COPYRIGHT=Copyright 2015
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=40 37 HS_MINOR_VER=40
38 HS_BUILD_NUMBER=18 38 HS_BUILD_NUMBER=20
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