Merge jdk8u60-b18

Thu, 28 May 2015 16:46:12 -0700

author
lana
date
Thu, 28 May 2015 16:46:12 -0700
changeset 1401
d1d9eb953fbb
parent 1399
11fc5372857b
parent 1400
0d3041c21ce9
child 1402
ff2ddaa4ea32
child 1404
17e06bbf496e

Merge

     1.1 --- a/make/Javadoc.gmk	Wed May 27 13:20:52 2015 -0700
     1.2 +++ b/make/Javadoc.gmk	Thu May 28 16:46:12 2015 -0700
     1.3 @@ -1212,8 +1212,7 @@
     1.4  # jaccessdocs - Java Accessibility Utilities
     1.5  #
     1.6  
     1.7 -# Disable generation for now due to build break of nightly
     1.8 -#ALL_OTHER_TARGETS += jaccessdocs
     1.9 +ALL_OTHER_TARGETS += jaccessdocs
    1.10  
    1.11  JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec
    1.12  JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI)

mercurial