Merge

Tue, 15 Dec 2015 22:58:02 -0800

author
asaha
date
Tue, 15 Dec 2015 22:58:02 -0800
changeset 1643
5704ec211704
parent 1583
832508a6165c
parent 1642
2617469302a3
child 1644
da1bcf196fa7

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Oct 26 13:20:08 2015 -0700
     1.2 +++ b/.hgtags	Tue Dec 15 22:58:02 2015 -0800
     1.3 @@ -355,6 +355,7 @@
     1.4  a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31
     1.5  99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32
     1.6  cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33
     1.7 +685af74060e723783f83c84040c04902674e2e1f jdk8u31-b34
     1.8  0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
     1.9  f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
    1.10  b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
    1.11 @@ -426,6 +427,8 @@
    1.12  54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15
    1.13  3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16
    1.14  58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31
    1.15 +3dcabe6d7fdd37e73ebdd82d414c4939a50b58b7 jdk8u51-b32
    1.16 +586cfdfb13dd3f3b787d4fc1de7a03abd3a2457d jdk8u51-b33
    1.17  ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
    1.18  acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
    1.19  2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
    1.20 @@ -454,6 +457,8 @@
    1.21  be2ddf520d263ea27a075f895d93adada6702027 jdk8u60-b25
    1.22  d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
    1.23  d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
    1.24 +cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
    1.25 +d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
    1.26  45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
    1.27  2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
    1.28  45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
    1.29 @@ -488,10 +493,34 @@
    1.30  d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
    1.31  5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
    1.32  6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
    1.33 +a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18
    1.34 +e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31
    1.35 +ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
    1.36 +1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
    1.37 +b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
    1.38 +3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
    1.39 +1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
    1.40 +c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
    1.41 +2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
    1.42 +9b1bb13cc10cae3379849f341ccd0f21600de863 jdk8u71-b07
    1.43 +0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
    1.44 +4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
    1.45 +5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
    1.46 +4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
    1.47 +4d09473111deb8fd6323df6f9e9536084cae2844 jdk8u71-b12
    1.48 +4f9e7b1a4e04f2ae44c1f6501e4444b82c45afff jdk8u71-b13
    1.49  31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
    1.50  d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
    1.51  2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
    1.52  4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
    1.53  19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
    1.54  674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
    1.55 +8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
    1.56 +98f42c9df8c121347367164776eff3ebd50cb91e jdk8u72-b07
    1.57 +55c885702381d47704589a37f05c0f7045be4e36 jdk8u72-b08
    1.58 +178589d241af764add3d4cbf6977945f65859c1d jdk8u72-b09
    1.59 +bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10
    1.60 +3b454f1fb441a71836666b6727274a937249ca92 jdk8u72-b11
    1.61 +e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12
    1.62 +8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13
    1.63  e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
     2.1 --- a/make/Javadoc.gmk	Mon Oct 26 13:20:08 2015 -0700
     2.2 +++ b/make/Javadoc.gmk	Tue Dec 15 22:58:02 2015 -0800
     2.3 @@ -258,6 +258,8 @@
     2.4  with conceptual overviews, definitions of terms, workarounds, \
     2.5  and working code examples.<br>\
     2.6  $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
     2.7 +Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
     2.8 +Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
     2.9  </font>
    2.10  
    2.11  # Common javadoc options used by all

mercurial