# HG changeset patch # User katleman # Date 1366149654 25200 # Node ID 002ad9d6735f36d1204e133324c73058c8abb1b0 # Parent 35881a9d0fc2ea3070a882e0dd3384b572f25d43# Parent 399a4b8e4607005e72866420a04f5422e7501652 Merge diff -r 35881a9d0fc2 -r 002ad9d6735f docs/JavaScriptingProgrammersGuide.html --- 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 @@ + diff -r 35881a9d0fc2 -r 002ad9d6735f src/jdk/nashorn/api/scripting/Formatter.java --- 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