Merge jdk8u40-b13

Fri, 31 Oct 2014 20:17:35 -0700

author
lana
date
Fri, 31 Oct 2014 20:17:35 -0700
changeset 1197
43ccc2b9d5b7
parent 1194
9f996a9338b8
parent 1196
196ee1e3add0
child 1198
df659b8b0bc8

Merge

     1.1 --- a/make/Javadoc.gmk	Wed Oct 29 10:50:28 2014 -0700
     1.2 +++ b/make/Javadoc.gmk	Fri Oct 31 20:17:35 2014 -0700
     1.3 @@ -311,6 +311,13 @@
     1.4  #################################################################
     1.5  
     1.6  #
     1.7 +# Load custom Javadoc rules, if present
     1.8 +#
     1.9 +-include $(CUSTOM_MAKE_DIR)/Javadoc.gmk
    1.10 +
    1.11 +#################################################################
    1.12 +
    1.13 +#
    1.14  # Default target is same as docs target, create core api and all others it can
    1.15  #
    1.16  

mercurial