summaryrefslogtreecommitdiff
path: root/beanshell
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-03-10 16:36:40 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-03-10 16:36:40 +0100
commitc2d29ac9121978fb53dc7e4e17202aebcab749cd (patch)
tree10325b564e2a14afd9c843dfb2e1093dc239a8ec /beanshell
parent7e14492c9931c8780f50999c52f56215a1ba2281 (diff)
parent697dd812b2c17fc2f5c2737e981854dedc41c26d (diff)
ause110: update to DEV300_m74
Diffstat (limited to 'beanshell')
-rw-r--r--beanshell/bsh-2.0b1-src.patch8
-rw-r--r--beanshell/makefile.mk6
2 files changed, 3 insertions, 11 deletions
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index aa880975a12d..99e8b8b9ddc2 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b1-src.patch
@@ -31,20 +31,16 @@
<property name="legacy-excludes"
--- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008
+++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008
-@@ -1 +1,39 @@
+@@ -1 +1,35 @@
-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: bsh-2.0b1-src.patch,v $
-+#
-+# $Revision: 1.7 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 26ebc368cb4c..6e89a0034e97 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/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.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify