summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc/mailmrge.hxx
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
commit1a359bd2a8d7621574942287703e7df69ebffa16 (patch)
tree6903f7425247815fcdb9eb4812ee7096dc48c379 /sw/source/ui/inc/mailmrge.hxx
parentb36241988ea99ba2a9d290ec838a3557d0333d63 (diff)
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
Diffstat (limited to 'sw/source/ui/inc/mailmrge.hxx')
-rw-r--r--sw/source/ui/inc/mailmrge.hxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index a4be36e07d5f..e1f9f355c96a 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -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: mailmrge.hxx,v $
- * $Revision: 1.15 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
ALv2 code. Includes:Michael Meeks 2012-11-07sal_Bool to boolTakeshi Abe 2011-03-23Merge commit 'ooo/DEV300_m103'Jan Holesovsky 2011-03-14Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Michael Meeks 2011-02-09CWS swlayoutrefactoring: fix merge conflictsMathias Bauer 2011-02-09CWS swlayoutrefactoring: resync to m100Mathias Bauer 2011-01-17removetooltypes01: #i112600# Remove tools types from swCarsten Driesner 2010-12-21CWS swlayoutrefactoring: #i115510#: use boost::noncopyable for SwClient; move...Mathias Bauer 2010-12-17CWS swlayoutrefactoring: #i115510#: first step to clean up the SwClient messMathias Bauer 2010-11-25Removed DBG_UTIL from swCédric Bosdonnat 2010-10-14Add vim/emacs modelines to all source filesSebastian Spaeth 2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien 2009-09-11CWS-TOOLING: integrate CWS odfmetadata3Kurt Zenker 2009-07-02CWS-TOOLING: integrate CWS odfmetadata2Release Engineers 2009-01-05CWS-TOOLING: integrate CWS libmswordJens-Heiner Rechtien 2008-10-10CWS-TOOLING: integrate CWS cmcfixes49Oliver Bolte 2008-04-10INTEGRATION: CWS changefileheader (1.6.738); FILE MERGEDRüdiger Timm 2006-08-14INTEGRATION: CWS writercorehandoff (1.4.462); FILE MERGEDJens-Heiner Rechtien 2005-09-09INTEGRATION: CWS ooo19126 (1.4.596); FILE MERGEDRüdiger Timm