diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
| commit | 16832959361d205cc25b21cd1aeaad9b90f41ea0 (patch) | |
| tree | c443efd6dae8f4886be54e6675c51a493660b567 /rhino/rhino1_5R5.patch | |
| parent | f75fcb170699d867e1892c9f2b696a1b152cd16f (diff) | |
| parent | 4bc7de8f2867c8942e17220e1eb9539594b54475 (diff) | |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'rhino/rhino1_5R5.patch')
| -rw-r--r-- | rhino/rhino1_5R5.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch index 1c8fb2385705..21b4a484be8e 100644 --- a/rhino/rhino1_5R5.patch +++ b/rhino/rhino1_5R5.patch @@ -1043,19 +1043,16 @@ --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:25:34 2008 +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:24:59 2008 -@@ -1 +1,133 @@ +@@ -1 +1,130 @@ -dummy +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * Copyright 2008 by Sun Microsystems, Inc. ++ * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * -+ * $RCSfile: rhino1_5R5.patch,v $ -+ * $Revision: 1.3 $ -+ * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify |