Mercurial > hg > openjdk > jdk8u > nashorn
changeset 183:002ad9d6735f jdk8-b86
Merge
author | katleman |
---|---|
date | Tue, 16 Apr 2013 15:00:54 -0700 |
parents | 35881a9d0fc2 (current diff) 399a4b8e4607 (diff) |
children | 899cbeee7253 cba329ce5efe |
files | |
diffstat | 2 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/JavaScriptingProgrammersGuide.html Tue Apr 16 08:16:17 2013 -0700 +++ b/docs/JavaScriptingProgrammersGuide.html Tue Apr 16 15:00:54 2013 -0700 @@ -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 Tue Apr 16 08:16:17 2013 -0700 +++ b/src/jdk/nashorn/api/scripting/Formatter.java Tue Apr 16 15:00:54 2013 -0700 @@ -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