diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | c2d29ac9121978fb53dc7e4e17202aebcab749cd (patch) | |
| tree | 10325b564e2a14afd9c843dfb2e1093dc239a8ec /rhino | |
| parent | 7e14492c9931c8780f50999c52f56215a1ba2281 (diff) | |
| parent | 697dd812b2c17fc2f5c2737e981854dedc41c26d (diff) | |
ause110: update to DEV300_m74
Diffstat (limited to 'rhino')
| -rwxr-xr-x | rhino/makefile.mk | 6 | ||||
| -rw-r--r-- | rhino/rhino1_5R5.patch | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 5244af24f5d7..008fb0caef2d 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -2,14 +2,10 @@ # # 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: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify 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 |