Merge jdk8u102-b11

Mon, 06 Jun 2016 13:17:28 -0700

author
asaha
date
Mon, 06 Jun 2016 13:17:28 -0700
changeset 1896
7bd6f4f266f6
parent 1893
085240c71a28
parent 1895
2f506194a131
child 1897
ff14b7c67177

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue May 31 10:30:30 2016 -0700
     1.2 +++ b/.hgtags	Mon Jun 06 13:17:28 2016 -0700
     1.3 @@ -588,6 +588,7 @@
     1.4  926025d895a459bec2031a17e674c4aa5ebe6fe1 jdk8u101-b08
     1.5  47209e0bae1d65243158b3d8c2f6602cc265832c jdk8u101-b09
     1.6  740d8d604c0ef2b12d9835d2842f60dcc08fee0d jdk8u101-b10
     1.7 +de5fdc537134ec505958a66d79c0ff68282520d2 jdk8u101-b11
     1.8  120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u102-b00
     1.9  120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u82-b00
    1.10  79dcbdb92a8c39de6d1417557af9e6c2c03f806d jdk8u102-b01
     2.1 --- a/test/script/basic/JDK-8134488.js	Tue May 31 10:30:30 2016 -0700
     2.2 +++ b/test/script/basic/JDK-8134488.js	Mon Jun 06 13:17:28 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	Tue May 31 10:30:30 2016 -0700
     3.2 +++ b/test/script/basic/JDK-8134490.js	Mon Jun 06 13:17:28 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	Tue May 31 10:30:30 2016 -0700
     4.2 +++ b/test/script/basic/JDK-8134939.js	Mon Jun 06 13:17:28 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