Merge

Thu, 05 Dec 2013 10:32:36 -0800

author
lana
date
Thu, 05 Dec 2013 10:32:36 -0800
changeset 918
f204455b60cc
parent 916
6c9cfee19264
parent 917
c009462c1e92
child 919
cd3825b29830

Merge

     1.1 --- a/common/autoconf/spec.gmk.in	Wed Dec 04 23:10:55 2013 -0800
     1.2 +++ b/common/autoconf/spec.gmk.in	Thu Dec 05 10:32:36 2013 -0800
     1.3 @@ -236,7 +236,6 @@
     1.4  JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
     1.5  NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
     1.6  IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
     1.7 -JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
     1.8  
     1.9  LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
    1.10  CORBA_DIST=$(CORBA_OUTPUTDIR)/dist

mercurial