Merge

Wed, 15 Jun 2016 13:52:34 -0700

author
asaha
date
Wed, 15 Jun 2016 13:52:34 -0700
changeset 1912
958afe395573
parent 1911
dc56f37dffd2
parent 1900
e0d6c13b7d02
child 1916
61e68e59fede

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon May 16 14:35:32 2016 -0700
     1.2 +++ b/.hgtags	Wed Jun 15 13:52:34 2016 -0700
     1.3 @@ -555,6 +555,7 @@
     1.4  a2c005a7b33abed886cfb4309a846dd80c87bd4e jdk8u91-b00
     1.5  22925b345dffe4ba96fe2f429c4185cda1b30239 jdk8u91-b13
     1.6  6296644a2c9c30db0062117fc776341e937ca1f9 jdk8u91-b14
     1.7 +32b80df71ca2a6ae827ba7042cea868f40e0a0dd jdk8u91-b15
     1.8  7bce03d47545e6a5341a2722168cd6bf697c4132 jdk8u77-b00
     1.9  678b645aa10aaf27895c87872c399c15daa026a1 jdk8u77-b01
    1.10  09abd795d1d143933224bcb3f12f5d4686b65373 jdk8u77-b02
    1.11 @@ -585,6 +586,10 @@
    1.12  3bc08e0d23a3965937e634d00e84ea69505e2653 jdk8u101-b06
    1.13  313c90baea02c1c8c162bea894c7adf6dc33a05b jdk8u101-b07
    1.14  926025d895a459bec2031a17e674c4aa5ebe6fe1 jdk8u101-b08
    1.15 +47209e0bae1d65243158b3d8c2f6602cc265832c jdk8u101-b09
    1.16 +740d8d604c0ef2b12d9835d2842f60dcc08fee0d jdk8u101-b10
    1.17 +de5fdc537134ec505958a66d79c0ff68282520d2 jdk8u101-b11
    1.18 +2f506194a131597352bbe1a08492266a8aed13f8 jdk8u101-b12
    1.19  120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u102-b00
    1.20  120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u82-b00
    1.21  79dcbdb92a8c39de6d1417557af9e6c2c03f806d jdk8u102-b01
    1.22 @@ -595,4 +600,8 @@
    1.23  114e7557d33ce9e5f1bf982f45977a630c44d8a5 jdk8u102-b06
    1.24  13a10967cff181a71933a4f1508691553f43304b jdk8u102-b07
    1.25  31c898437a15f4feef6c1502d3f1eaf8a3d9de48 jdk8u102-b08
    1.26 +e4f74a337545a0283f9b7bb6a85ce1b2c4a5fdd6 jdk8u102-b09
    1.27 +3b84415442d7b4eaa4a7da75b9d428e81e8be575 jdk8u102-b10
    1.28 +7bd6f4f266f66d32e4ce743928d7c4021c23c477 jdk8u102-b11
    1.29 +e3db6994bbbd654be3ebd677b2cc80469f7133a3 jdk8u102-b12
    1.30  9bd5aadd8e739d4ad4bb2e30741cdbe9ae2bae66 jdk8u111-b00
     2.1 --- a/test/script/basic/JDK-8134488.js	Mon May 16 14:35:32 2016 -0700
     2.2 +++ b/test/script/basic/JDK-8134488.js	Wed Jun 15 13:52:34 2016 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   * 
     2.9   * This code is free software; you can redistribute it and/or modify it
     3.1 --- a/test/script/basic/JDK-8134490.js	Mon May 16 14:35:32 2016 -0700
     3.2 +++ b/test/script/basic/JDK-8134490.js	Wed Jun 15 13:52:34 2016 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   * 
     3.9   * This code is free software; you can redistribute it and/or modify it
     4.1 --- a/test/script/basic/JDK-8134939.js	Mon May 16 14:35:32 2016 -0700
     4.2 +++ b/test/script/basic/JDK-8134939.js	Wed Jun 15 13:52:34 2016 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   * 
     4.9   * This code is free software; you can redistribute it and/or modify it

mercurial