Merge

Fri, 31 Jan 2014 00:14:30 +0000

author
coffeys
date
Fri, 31 Jan 2014 00:14:30 +0000
changeset 937
eda060dc8e89
parent 934
5a681b1f428d
parent 936
4f590c2cec75
child 938
1a13916186e4

Merge

     1.1 --- a/THIRD_PARTY_README	Thu Jan 23 20:42:36 2014 +0000
     1.2 +++ b/THIRD_PARTY_README	Fri Jan 31 00:14:30 2014 +0000
     1.3 @@ -1400,7 +1400,7 @@
     1.4  -------------------------------------------------------------------------------
     1.5  
     1.6  %% This notice is provided with respect to Little CMS 2.4, which may be 
     1.7 -included with OpenJDK 8.
     1.8 +included with JRE 8, JDK 8, and OpenJDK 8.
     1.9  
    1.10  --- begin of LICENSE ---
    1.11  
     2.1 --- a/common/autoconf/spec.gmk.in	Thu Jan 23 20:42:36 2014 +0000
     2.2 +++ b/common/autoconf/spec.gmk.in	Fri Jan 31 00:14:30 2014 +0000
     2.3 @@ -170,7 +170,7 @@
     2.4  COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
     2.5  # These variables need to be generated here so that MILESTONE and
     2.6  # JDK_BUILD_NUMBER can be overridden on the make command line.
     2.7 -ifeq ($(MILESTONE),)
     2.8 +ifeq ($(MILESTONE), fcs)
     2.9    RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
    2.10  else
    2.11    RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)

mercurial