summaryrefslogtreecommitdiff
path: root/rhino
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
commitaac3a82b827c04ce885e07e9fea8226aaf11b5c7 (patch)
tree31524d04336c97ca3fc0f1294a0c98be6c50a71d /rhino
parentf0a46da1de3285cf4fab41914ac98d93288eb7a7 (diff)
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
Diffstat (limited to 'rhino')
-rwxr-xr-xrhino/makefile.mk6
-rw-r--r--rhino/rhino1_5R5.patch7
2 files changed, 3 insertions, 10 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 0809007ea7b4..2facbe2dea00 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