Mercurial > hg > openjdk > jdk8u > nashorn

changeset 1888:7bd6f4f266f6 jdk8u102-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 06 Jun 2016 13:17:28 -0700
parents 085240c71a28 (current diff) 2f506194a131 (diff)
children ff14b7c67177
files .hgtags
diffstat 4 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue May 31 10:30:30 2016 -0700
+++ b/.hgtags	Mon Jun 06 13:17:28 2016 -0700
@@ -588,6 +588,7 @@
 926025d895a459bec2031a17e674c4aa5ebe6fe1 jdk8u101-b08
 47209e0bae1d65243158b3d8c2f6602cc265832c jdk8u101-b09
 740d8d604c0ef2b12d9835d2842f60dcc08fee0d jdk8u101-b10
+de5fdc537134ec505958a66d79c0ff68282520d2 jdk8u101-b11
 120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u102-b00
 120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u82-b00
 79dcbdb92a8c39de6d1417557af9e6c2c03f806d jdk8u102-b01
--- a/test/script/basic/JDK-8134488.js	Tue May 31 10:30:30 2016 -0700
+++ b/test/script/basic/JDK-8134488.js	Mon Jun 06 13:17:28 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
--- a/test/script/basic/JDK-8134490.js	Tue May 31 10:30:30 2016 -0700
+++ b/test/script/basic/JDK-8134490.js	Mon Jun 06 13:17:28 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
--- a/test/script/basic/JDK-8134939.js	Tue May 31 10:30:30 2016 -0700
+++ b/test/script/basic/JDK-8134939.js	Mon Jun 06 13:17:28 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it