comparison make/hotspot_version @ 13435:bf15208b72a5

Merge
author mgronlun
date Sun, 08 Dec 2013 18:00:58 +0100
parents 3aa20cee331a
children 02f27ecb4f3a 7469c9ca967a e5561d89fe8b
comparison
equal deleted inserted replaced
13434:a150ff9e8efc 13435:bf15208b72a5
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=62 38 HS_BUILD_NUMBER=63
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