summaryrefslogtreecommitdiff
path: root/xmerge/util
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
commitea6543401c1cd17e18aba93603aeeafd332fff15 (patch)
tree3837634f3dfdacaaa8aa2c13718442aa1d81f397 /xmerge/util
parentd1e7561aa828518dcbbbf78226877b4d564af2dd (diff)
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
Diffstat (limited to 'xmerge/util')
-rw-r--r--xmerge/util/build.xml6
-rw-r--r--xmerge/util/makefile.mk6
2 files changed, 2 insertions, 10 deletions
diff --git a/xmerge/util/build.xml b/xmerge/util/build.xml
index 89a41211165f..f15ad3acff08 100644
--- a/xmerge/util/build.xml
+++ b/xmerge/util/build.xml
@@ -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: build.xml,v $
-
- $Revision: 1.13 $
-
This file is part of OpenOffice.org.
OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmerge/util/makefile.mk b/xmerge/util/makefile.mk
index 61ee7d712eb5..54ed16e3ef8e 100644
--- a/xmerge/util/makefile.mk
+++ b/xmerge/util/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.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify