comparison make/hotspot_version @ 12039:3cce976666d9

Merge hs25-b46
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 10 Oct 2013 14:20:04 +0200
parents 6b0fd0964b87 39127bb12d32
children cefad50507d8
comparison
equal deleted inserted replaced
11958:a0f5be106e67 12039:3cce976666d9
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=43 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