Mercurial > hg > openjdk > lambda > nashorn
changeset 359:af8a98ea83d4
Merge
author | chegar |
---|---|
date | Wed, 24 Apr 2013 11:03:39 +0100 |
parents | cfda59f3d827 (current diff) 774aeaa89bc1 (diff) |
children | 2237e2ff3685 |
files | |
diffstat | 3 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 22 19:57:57 2013 +0530 +++ b/.hgtags Wed Apr 24 11:03:39 2013 +0100 @@ -195,3 +195,4 @@ 053d7c55dc8272b58b8bb870dc92a4acf896d52a jdk8-b83 999cc1bf55203f51b2985feae6378932667ecff2 jdk8-b84 e0378f0a50dafdcfb7b04f6401d320f89884baa1 jdk8-b85 +002ad9d6735f36d1204e133324c73058c8abb1b0 jdk8-b86
--- a/docs/JavaScriptingProgrammersGuide.html Mon Apr 22 19:57:57 2013 +0530 +++ b/docs/JavaScriptingProgrammersGuide.html Wed Apr 24 11:03:39 2013 +0100 @@ -1,3 +1,27 @@ +<!-- + Copyright (c) 2010, 2013, 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 + under the terms of the GNU General Public License version 2 only, as + published by the Free Software Foundation. Oracle designates this + particular file as subject to the "Classpath" exception as provided + by Oracle in the LICENSE file that accompanied this code. + + This code is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + version 2 for more details (a copy is included in the LICENSE file that + accompanied this code). + + You should have received a copy of the GNU General Public License version + 2 along with this work; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + or visit www.oracle.com if you need additional information or have any + questions. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html class=" regenabled gecko radius jsenabled regloaded" xmlns="http://www.w3.org/1999/xhtml"><head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
--- a/src/jdk/nashorn/api/scripting/Formatter.java Mon Apr 22 19:57:57 2013 +0530 +++ b/src/jdk/nashorn/api/scripting/Formatter.java Wed Apr 24 11:03:39 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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