# HG changeset patch # User katleman # Date 1366060868 25200 # Node ID 399a4b8e4607005e72866420a04f5422e7501652 # Parent aed0529f5f5d167087ea0550ec7659f0e7fbb923# Parent e7e82c1e9aed14b1dc482e25f2b8324cbc071978 Merge diff -r aed0529f5f5d -r 399a4b8e4607 docs/JavaScriptingProgrammersGuide.html --- a/docs/JavaScriptingProgrammersGuide.html Thu Apr 11 09:40:24 2013 -0700 +++ b/docs/JavaScriptingProgrammersGuide.html Mon Apr 15 14:21:08 2013 -0700 @@ -1,3 +1,27 @@ + diff -r aed0529f5f5d -r 399a4b8e4607 src/jdk/nashorn/api/scripting/Formatter.java --- a/src/jdk/nashorn/api/scripting/Formatter.java Thu Apr 11 09:40:24 2013 -0700 +++ b/src/jdk/nashorn/api/scripting/Formatter.java Mon Apr 15 14:21:08 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