diff options
author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
commit | 87ec9c993b24c8171daf8d0b65868542381b24ae (patch) | |
tree | f80d7ffa347e91fc9047745059c631cb21729c98 /setup_native/scripts | |
parent | sb118: fix lifetime of InitUpdateCheckJobThread, preventing modification of d... (diff) | |
parent | CWS-TOOLING: integrate CWS changefileheader2 (diff) | |
download | core-87ec9c993b24c8171daf8d0b65868542381b24ae.tar.gz core-87ec9c993b24c8171daf8d0b65868542381b24ae.zip |
sb118: merged in DEV300_m72
Diffstat (limited to 'setup_native/scripts')
-rw-r--r-- | setup_native/scripts/admin.pl | 6 | ||||
-rw-r--r-- | setup_native/scripts/makefile.mk | 6 | ||||
-rw-r--r-- | setup_native/scripts/source/makefile.mk | 6 | ||||
-rw-r--r-- | setup_native/scripts/stclient_wrapper.sh | 2 | ||||
-rw-r--r-- | setup_native/scripts/userland.txt | 6 |
5 files changed, 5 insertions, 21 deletions
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index bb2f8b3a7d91..6fedae20ca5d 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -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: admin.pl,v $ -# -# $Revision: 1.1.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index 59b310fe0e70..b8fc6649eddf 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/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.18.112.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk index 6ff2dfe0afe6..6933f53d6149 100644 --- a/setup_native/scripts/source/makefile.mk +++ b/setup_native/scripts/source/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.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/setup_native/scripts/stclient_wrapper.sh b/setup_native/scripts/stclient_wrapper.sh index 223b8a35f6d8..52ff8abcb0ee 100644 --- a/setup_native/scripts/stclient_wrapper.sh +++ b/setup_native/scripts/stclient_wrapper.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2007 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # All rights reserved. # diff --git a/setup_native/scripts/userland.txt b/setup_native/scripts/userland.txt index 7c7ef86f45a3..9983ab46fe16 100644 --- a/setup_native/scripts/userland.txt +++ b/setup_native/scripts/userland.txt @@ -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: userland.txt,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |