# HG changeset patch # User katleman # Date 1366149654 25200 # Node ID 6ee429aebbde076926392b6bbbca06f3bdcc6dbd # Parent 7b9e05da599511f0b421e076fed49484643276e8# Parent 7e5594b392d33d4e689944cd1afab63f79147249 Merge diff -r 7b9e05da5995 -r 6ee429aebbde nashorn/docs/JavaScriptingProgrammersGuide.html --- a/nashorn/docs/JavaScriptingProgrammersGuide.html Tue Apr 16 08:16:17 2013 -0700 +++ b/nashorn/docs/JavaScriptingProgrammersGuide.html Tue Apr 16 15:00:54 2013 -0700 @@ -1,3 +1,27 @@ + diff -r 7b9e05da5995 -r 6ee429aebbde nashorn/src/jdk/nashorn/api/scripting/Formatter.java --- a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java Tue Apr 16 08:16:17 2013 -0700 +++ b/nashorn/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