提交 932e610d 编写于 作者: A asaha

Merge

...@@ -666,6 +666,8 @@ b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14 ...@@ -666,6 +666,8 @@ b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15 bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16 14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31 1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
911c506096560e49442a4c8f598f7f43c2339720 jdk8u112-b32
8e27761a403ff4b237219cfb22731e127a1d1744 jdk8u112-b33
58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00 58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01 a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01
a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02 a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02
...@@ -680,6 +682,12 @@ b9e523138b2dc4e8456c3ac295f9bb57d21f1f77 jdk8u121-b08 ...@@ -680,6 +682,12 @@ b9e523138b2dc4e8456c3ac295f9bb57d21f1f77 jdk8u121-b08
bfe05759587ddc30a32c00637180588cec309ee3 jdk8u121-b11 bfe05759587ddc30a32c00637180588cec309ee3 jdk8u121-b11
97c858f7f7c827730d05eb69134ac89e156f8685 jdk8u121-b12 97c858f7f7c827730d05eb69134ac89e156f8685 jdk8u121-b12
f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13 f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13
7cc899fc144561be76c4286b3e9ee06b1facef32 jdk8u121-b31
6838c13eb094eeb3119decfd952dedc2f51427ed jdk8u121-b32
77581d764b55726370f40552b32d8bdc3a12f285 jdk8u121-b33
31e1a5ba68cd0f00585c4adea6b405d8bc166361 jdk8u121-b34
041abd76a482e3df5dffe1b303853dae1fa52c7a jdk8u121-b35
6b5494fc6df0c6608fe869275b188c41fe47cfdb jdk8u121-b36
986503d59e09ac8f61bac904b0875abbe869492f jdk8u131-b00 986503d59e09ac8f61bac904b0875abbe869492f jdk8u131-b00
8d1b3d2482437ec6a0bfae10e1475fd80916ab7d jdk8u131-b01 8d1b3d2482437ec6a0bfae10e1475fd80916ab7d jdk8u131-b01
66811607997db903aae54676f43974c7f918da10 jdk8u131-b02 66811607997db903aae54676f43974c7f918da10 jdk8u131-b02
...@@ -692,6 +700,10 @@ f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13 ...@@ -692,6 +700,10 @@ f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13
1e9f98c8e4f5e49d1c240d2a92ad0e00f1430040 jdk8u131-b09 1e9f98c8e4f5e49d1c240d2a92ad0e00f1430040 jdk8u131-b09
725620ca52fbc260782c522845e310b9c9aed59a jdk8u131-b10 725620ca52fbc260782c522845e310b9c9aed59a jdk8u131-b10
94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11 94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11
26016f048003d216cdf83e1b0318b6fc988a4ca8 jdk8u131-b31
cc52a119d110cc633dce64629d4d25b3e1cc3b67 jdk8u131-b32
ff0e5fb867ed031ee8d629e6ddc637f92f03dc17 jdk8u131-b33
e0c72f33efb916a8eafbca328f3f848b87383cc4 jdk8u131-b34
756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00 756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00
b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01 b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01
3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02 3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02
...@@ -708,11 +720,20 @@ a4df4fcf824df487488cf2c6e8e8236116f4723f jdk8u141-b06 ...@@ -708,11 +720,20 @@ a4df4fcf824df487488cf2c6e8e8236116f4723f jdk8u141-b06
1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15 48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00 9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00
57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01 57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01
21446f3c909e3ed750def8b4dacbec6074606ed3 jdk8u144-b31
b032efb8a72675cfded271b99ad84602189f7849 jdk8u144-b32
9a2e03172d83689006df0a86d89cc84cf82b7b12 jdk8u144-b33
fe4076d1d773f63ab4ff9cc9cfc605c174a7b156 jdk8u144-b34
123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03 66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04 6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05 6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05
...@@ -766,6 +787,13 @@ d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02 ...@@ -766,6 +787,13 @@ d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02
0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03 0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03
ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04 ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04
c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05 c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05
ff59566476c79e8143bf18eefb79196cc3a12994 jdk8u152-b06
c0a2f84796bc8a55bb686069114de60a7cc2c875 jdk8u152-b07
00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
6e53d489c0a58cb548a65396ae8383a9f2e298d2 jdk8u161-b01
d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u161-b02
33f1ededc6f79f4c1d476d63f650d020d1a68d20 jdk8u161-b03
7b4e91fb47c3ea83ca920a0e0701a5b793674d7c jdk8u161-b04
ccac71a8778d18186967618df12bd2612d758f4b jdk8u162-b00 ccac71a8778d18186967618df12bd2612d758f4b jdk8u162-b00
6d91dff0d6f13d08e4c68388ac6c65cf84a5f9d0 jdk8u162-b01 6d91dff0d6f13d08e4c68388ac6c65cf84a5f9d0 jdk8u162-b01
af980289e0dfe499238386146600de662e84b5d5 jdk8u162-b02 af980289e0dfe499238386146600de662e84b5d5 jdk8u162-b02
......
...@@ -7,7 +7,7 @@ OpenJDK 8. ...@@ -7,7 +7,7 @@ OpenJDK 8.
--- begin of LICENSE --- --- begin of LICENSE ---
Copyright (c) 2000-2011 France Télécom Copyright (c) 2000-2011 France T??l??com
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
...@@ -849,7 +849,7 @@ JRE 8, JDK 8, and OpenJDK 8. ...@@ -849,7 +849,7 @@ JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE --- --- begin of LICENSE ---
Copyright notice Copyright notice
Copyright © 2011 Ecma International Copyright ?? 2011 Ecma International
Ecma International Ecma International
Rue du Rhone 114 Rue du Rhone 114
CH-1204 Geneva CH-1204 Geneva
...@@ -916,7 +916,7 @@ Linux and Solaris. ...@@ -916,7 +916,7 @@ Linux and Solaris.
--- begin of LICENSE --- --- begin of LICENSE ---
Copyright © 2001,2003 Keith Packard Copyright ?? 2001,2003 Keith Packard
Permission to use, copy, modify, distribute, and sell this software and its Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that the documentation for any purpose is hereby granted without fee, provided that the
...@@ -2212,16 +2212,16 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8. ...@@ -2212,16 +2212,16 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8.
Unicode Terms of Use Unicode Terms of Use
For the general privacy policy governing access to this site, see the Unicode For the general privacy policy governing access to this site, see the Unicode
Privacy Policy. For trademark usage, see the Unicode® Consortium Name and Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and
Trademark Usage Policy. Trademark Usage Policy.
A. Unicode Copyright. A. Unicode Copyright.
1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved.
2. Certain documents and files on this website contain a legend indicating 2. Certain documents and files on this website contain a legend indicating
that "Modification is permitted." Any person is hereby authorized, that "Modification is permitted." Any person is hereby authorized,
without fee, to modify such documents and files to create derivative without fee, to modify such documents and files to create derivative
works conforming to the Unicode® Standard, subject to Terms and works conforming to the Unicode?? Standard, subject to Terms and
Conditions herein. Conditions herein.
3. Any person is hereby authorized, without fee, to view, use, reproduce, 3. Any person is hereby authorized, without fee, to view, use, reproduce,
...@@ -2287,14 +2287,14 @@ D. Waiver of Damages. In no event shall Unicode or its licensors be liable for ...@@ -2287,14 +2287,14 @@ D. Waiver of Damages. In no event shall Unicode or its licensors be liable for
E.Trademarks & Logos. E.Trademarks & Logos.
1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode,
Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of
Unicode, Inc. Use of the information and materials found on this Unicode, Inc. Use of the information and materials found on this
website indicates your acknowledgement of Unicode, Inc.s exclusive website indicates your acknowledgement of Unicode, Inc.???s exclusive
worldwide rights in the Unicode Word Mark, the Unicode Logo, and the worldwide rights in the Unicode Word Mark, the Unicode Logo, and the
Unicode trade names. Unicode trade names.
2. The Unicode Consortium Name and Trademark Usage Policy (Trademark 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark
Policy) are incorporated herein by reference and you agree to abide by Policy???) are incorporated herein by reference and you agree to abide by
the provisions of the Trademark Policy, which may be changed from time the provisions of the Trademark Policy, which may be changed from time
to time in the sole discretion of Unicode, Inc. to time in the sole discretion of Unicode, Inc.
...@@ -2317,12 +2317,12 @@ Miscellaneous. ...@@ -2317,12 +2317,12 @@ Miscellaneous.
2. Modification by Unicode. Unicode shall have the right to modify this 2. Modification by Unicode. Unicode shall have the right to modify this
Agreement at any time by posting it to this site. The user may not Agreement at any time by posting it to this site. The user may not
assign any part of this Agreement without Unicodes prior written assign any part of this Agreement without Unicode???s prior written
consent. consent.
3. Taxes. The user agrees to pay any taxes arising from access to this 3. Taxes. The user agrees to pay any taxes arising from access to this
website or use of the information herein, except for those based on website or use of the information herein, except for those based on
Unicodes net income. Unicode???s net income.
4. Severability. If any provision of this Agreement is declared invalid or 4. Severability. If any provision of this Agreement is declared invalid or
unenforceable, the remaining provisions of this Agreement shall remain unenforceable, the remaining provisions of this Agreement shall remain
...@@ -2351,7 +2351,7 @@ SOFTWARE. ...@@ -2351,7 +2351,7 @@ SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE COPYRIGHT AND PERMISSION NOTICE
Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
Terms of Use in http://www.unicode.org/copyright.html. Terms of Use in http://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
......
...@@ -3912,7 +3912,7 @@ fi ...@@ -3912,7 +3912,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1500960571 DATE_WHEN_GENERATED=1501170108
############################################################################### ###############################################################################
# #
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册