rev 7084 : Merge
*** 33,43 **** # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 HS_MINOR_VER=60 ! HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0 --- 33,43 ---- # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 HS_MINOR_VER=60 ! HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 JDK_MICRO_VER=0