summaryrefslogtreecommitdiff
path: root/toolkit/qa/complex/xunitconversion
diff options
context:
space:
mode:
authorMihaela Kedikova <misheto@openoffice.org>2010-03-23 15:28:55 +0100
committerMihaela Kedikova <misheto@openoffice.org>2010-03-23 15:28:55 +0100
commitd979d618f87a06795d8138eaaacc85f4852db0fd (patch)
treee45f7937f92ef0cdb9a5f8dc9702288e12441828 /toolkit/qa/complex/xunitconversion
parent0f1df8f471390de177610ee2bb9cc2f424d740c2 (diff)
parentf099cd4586bf41f30dea8190dbd2bd7b4234cf60 (diff)
gridcontrol_03: merge with DEV300_m75
Diffstat (limited to 'toolkit/qa/complex/xunitconversion')
-rw-r--r--toolkit/qa/complex/xunitconversion/XUnitConversionTest.java5
-rw-r--r--toolkit/qa/complex/xunitconversion/makefile.mk6
2 files changed, 2 insertions, 9 deletions
diff --git a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
index 8f2d5ca839c5..654f5ec69da5 100644
--- a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
+++ b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
@@ -2,13 +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: XUnitConversionTest.java,v $
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk
index a8be7a6ffb42..18b59ee19f18 100644
--- a/toolkit/qa/complex/xunitconversion/makefile.mk
+++ b/toolkit/qa/complex/xunitconversion/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.2.26.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify