提交 e283400a 编写于 作者: A asaha

Merge

......@@ -647,6 +647,8 @@ b0aa9a71f5fbcb0d58fa009fd9bd3ea0897b315e jdk8u112-b14
adc75eca17418a42357776339b390533a94541d6 jdk8u112-b15
d1f2cab06d35f6b7ac29f5c3eebd74a74a01b8fb jdk8u112-b16
d4beac03b1230ff8c96af79dcd10c56bdc475ebb jdk8u112-b31
5cd9541c75fd68f8b575cb8499d9d375bee1033c jdk8u112-b32
ad155bea4b3c781cb7d421ac1164f68f3e6693d2 jdk8u112-b33
1a484cc1d2ed0540543b0af4ebb8ad83bcb1c667 jdk8u121-b00
8f5fafa7e43b0b2472b077ea8f9b241976e1ea82 jdk8u121-b01
33bf988e6f1a2a2fa1dcec66da79a5411df6dcd5 jdk8u121-b02
......@@ -661,6 +663,12 @@ a32b4f984a18a7f9f6b412bf91c1a382df40d5ab jdk8u121-b07
fe53d09bdd8f4309ce3f79e9dc4c512639de2610 jdk8u121-b11
89c0a71eeb4ae2011e7ed10f36e79b5184c7827b jdk8u121-b12
fd548ea7e156aba26836084b838df5e90b90b6ba jdk8u121-b13
32caa413708a573a2a5ae4b9c3995463afa9a935 jdk8u121-b31
3fb9ceaacc7c478172efcaa1e7aa301acb5a182c jdk8u121-b32
b3d6a8eba070bff086e1c377c939e9b12931d159 jdk8u121-b33
edb73848ae77a82028e61b4664014076f5ee8998 jdk8u121-b34
8384d7bdab80940b0505edb7ea5c13c6da9789cc jdk8u121-b35
d4b246455b2915a7aa26a31c70be22037e786090 jdk8u121-b36
742cdd2928b641e842d7f1b78ea46f53ce95d9b3 jdk8u131-b00
6a466aa8901aba3b00ade9477cf748ec39a046c6 jdk8u131-b01
54416940aff09f0e53cdb3038fd124a233705c54 jdk8u131-b02
......@@ -673,6 +681,10 @@ b6b8e309e75ac5e5750687d32d8d9024c9a97fa0 jdk8u131-b08
c82e269f57968a997f71f6be393fba2af8f77708 jdk8u131-b09
9fef324cda01dfd13b32d52036522530e5e4f449 jdk8u131-b10
dfd626733d62e3e705f4e746dd0917b7ebc4c601 jdk8u131-b11
cab15bc838dac12db221e0d4809bfbce10bfdb13 jdk8u131-b31
89914de2826daaf6dd554aa506237328b1347c93 jdk8u131-b32
15b793414a867fb2996647e98e31432c6f20c707 jdk8u131-b33
1f2c989772b2c8a6aa588effb0e364c21305b2a3 jdk8u131-b34
0f9ad0ada320e0ba59abe28642b967ff97273cf8 jdk8u141-b00
7c09d30a05f1d5dbb6765faea282840f693cb68f jdk8u141-b01
a67daf8d1982fbdc9e45217e196484cab21c0d8c jdk8u141-b02
......@@ -691,6 +703,14 @@ e47b42f887ba51e27db2a9882eb10d2ee16830aa jdk8u141-b10
dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
6a52d202dfa3395d90cdd7dc24b8c437e5acc03d jdk8u144-b00
7de0a688b0d910d4ef2cb89da6623b3ded431276 jdk8u144-b01
6f50b0c7c275324f76cf7f09606949195fd65f92 jdk8u141-b31
59bf0950e077f66d1f6c5ef4a3f1489b2b2048fa jdk8u141-b32
6a52d202dfa3395d90cdd7dc24b8c437e5acc03d jdk8u144-b00
7de0a688b0d910d4ef2cb89da6623b3ded431276 jdk8u144-b01
a3c23983a7d6ab50f7978f992a979c6d26120775 jdk8u144-b31
0ef898499195e45a0f433c315025aed980565415 jdk8u144-b32
1e016788536a351ac3ef0bc075f069f30b6fd729 jdk8u144-b33
bbdeabb9875b44817042a80bdf79a608c7a56d8b jdk8u144-b34
6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
......@@ -731,6 +751,76 @@ b4f39fda3c39d41a33c9996555ddfd3200895756 jdk8u152-b10
6025f8527d42706d171201f0a912c760d4d0c037 jdk8u152-b14
a61136aa725ab8bb4721e8bb48aa827b49530978 jdk8u152-b15
d0841bfdb637d83ee0066df2f730b8a9b6fc3450 jdk8u152-b16
6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03
a593aff280ac5472a23923604f1a25c8e80e6ec7 jdk8u151-b04
178207e92304e6717c1b2e80c56424efe4e69204 jdk8u151-b05
b9ed966e2b873528553e27a791298205e1bc7cb5 jdk8u151-b06
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
12650d23a8fd1b27a0d28c6a276fdecf01805294 jdk8u122-b03
3c3b4e793e7c6255a840844db077ef466940035c jdk8u122-b04
30dc0c72f3d0aff34b6d421208b18f384d05d761 jdk8u132-b00
91d33aea2714e63796eeab0e63e38c9d2568c00c jdk8u152-b00
50dac2fd8689dbb820d887ce3919708d5d042891 jdk8u152-b01
01bbd310156db7a75a46a7320d1f49beff844472 jdk8u152-b02
2a01d94fea9a86b4038a93622f62b0986083f67e jdk8u152-b03
9dce75561a92f096d822ebb7eb76810f191fe522 jdk8u152-b04
cdb7d9454d254e95c73d6dc77077ab2c198e2ad6 jdk8u152-b05
2be667f12b54fc5b57b147f60851ee63ff02e5fa jdk8u152-b06
a44dcdfa00bee9261012f10bd3f06bea1fec4340 jdk8u152-b07
d0a8151a276c362a6e17068d9aa8ed583309d46e jdk8u152-b08
37e94d764d7b98e3676e54f2ad346d721fdde113 jdk8u152-b09
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
12650d23a8fd1b27a0d28c6a276fdecf01805294 jdk8u122-b03
3c3b4e793e7c6255a840844db077ef466940035c jdk8u122-b04
30dc0c72f3d0aff34b6d421208b18f384d05d761 jdk8u132-b00
91d33aea2714e63796eeab0e63e38c9d2568c00c jdk8u152-b00
50dac2fd8689dbb820d887ce3919708d5d042891 jdk8u152-b01
01bbd310156db7a75a46a7320d1f49beff844472 jdk8u152-b02
2a01d94fea9a86b4038a93622f62b0986083f67e jdk8u152-b03
9dce75561a92f096d822ebb7eb76810f191fe522 jdk8u152-b04
cdb7d9454d254e95c73d6dc77077ab2c198e2ad6 jdk8u152-b05
2be667f12b54fc5b57b147f60851ee63ff02e5fa jdk8u152-b06
a44dcdfa00bee9261012f10bd3f06bea1fec4340 jdk8u152-b07
6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
4c0e76ad6a499b51cb7653610fb396895470f770 jdk8u161-b00
c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
0000000000000000000000000000000000000000 jdk8u122-b03
12650d23a8fd1b27a0d28c6a276fdecf01805294 jdk8u122-b03
3c3b4e793e7c6255a840844db077ef466940035c jdk8u122-b04
30dc0c72f3d0aff34b6d421208b18f384d05d761 jdk8u132-b00
91d33aea2714e63796eeab0e63e38c9d2568c00c jdk8u152-b00
50dac2fd8689dbb820d887ce3919708d5d042891 jdk8u152-b01
01bbd310156db7a75a46a7320d1f49beff844472 jdk8u152-b02
2a01d94fea9a86b4038a93622f62b0986083f67e jdk8u152-b03
9dce75561a92f096d822ebb7eb76810f191fe522 jdk8u152-b04
cdb7d9454d254e95c73d6dc77077ab2c198e2ad6 jdk8u152-b05
2be667f12b54fc5b57b147f60851ee63ff02e5fa jdk8u152-b06
4c0e76ad6a499b51cb7653610fb396895470f770 jdk8u161-b00
f45cd0d5898e7879d2c73704441d848cf7a695c4 jdk8u161-b01
3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u161-b02
e33ecc88dd63f356bbfad88251b9790bc678c078 jdk8u161-b03
c21cf096431bf250451aaba88849a8d0d37d60d3 jdk8u161-b04
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
......
......@@ -7,7 +7,7 @@ OpenJDK 8.
--- begin of LICENSE ---
Copyright (c) 2000-2011 France Télécom
Copyright (c) 2000-2011 France T??l??com
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -849,7 +849,7 @@ JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
Copyright notice
Copyright © 2011 Ecma International
Copyright ?? 2011 Ecma International
Ecma International
Rue du Rhone 114
CH-1204 Geneva
......@@ -916,7 +916,7 @@ Linux and Solaris.
--- 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
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.
Unicode Terms of Use
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.
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
that "Modification is permitted." Any person is hereby authorized,
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.
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
E.Trademarks & Logos.
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
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
Unicode trade names.
2. The Unicode Consortium Name and Trademark Usage Policy (Trademark
Policy) are incorporated herein by reference and you agree to abide by
2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark
Policy???) are incorporated herein by reference and you agree to abide by
the provisions of the Trademark Policy, which may be changed from time
to time in the sole discretion of Unicode, Inc.
......@@ -2317,12 +2317,12 @@ Miscellaneous.
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
assign any part of this Agreement without Unicodes prior written
assign any part of this Agreement without Unicode???s prior written
consent.
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
Unicodes net income.
Unicode???s net income.
4. Severability. If any provision of this Agreement is declared invalid or
unenforceable, the remaining provisions of this Agreement shall remain
......@@ -2351,7 +2351,7 @@ SOFTWARE.
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.
Permission is hereby granted, free of charge, to any person obtaining a copy
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册