diff options
| author | katleman <none@none> | 2013-04-16 15:00:54 -0700 |
|---|---|---|
| committer | katleman <none@none> | 2013-04-16 15:00:54 -0700 |
| commit | 7a5d22462979aac610db213e4158a8652bdcb7ae (patch) | |
| tree | cea062ad51385c8e5a1e3bbd1928f5076eb5f03f | |
| parent | c485cb7e37be7b41b2b00d5c3d0a5df3539a4fba (diff) | |
| parent | edffbbdc321a681106242b4213c8c6c3abab62cd (diff) | |
Mergejdk8-b86
| -rw-r--r-- | docs/JavaScriptingProgrammersGuide.html | 24 | ||||
| -rw-r--r-- | src/jdk/nashorn/api/scripting/Formatter.java | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/docs/JavaScriptingProgrammersGuide.html b/docs/JavaScriptingProgrammersGuide.html index dd243d3a..811b29c9 100644 --- a/docs/JavaScriptingProgrammersGuide.html +++ b/docs/JavaScriptingProgrammersGuide.html @@ -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"> diff --git a/src/jdk/nashorn/api/scripting/Formatter.java b/src/jdk/nashorn/api/scripting/Formatter.java index 5cb19ed4..a14a83e4 100644 --- a/src/jdk/nashorn/api/scripting/Formatter.java +++ b/src/jdk/nashorn/api/scripting/Formatter.java @@ -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 |