summaryrefslogtreecommitdiffstats
path: root/sw/inc/accmap.hxx
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <od@openoffice.org>2010-02-25 19:54:08 +0100
committerOliver-Rainer Wittmann <od@openoffice.org>2010-02-25 19:54:08 +0100
commit5879e44bafec55e5a9b76cb38c992645948ec607 (patch)
treefb4b3eb2b43104421a8cb979ea9b082290cac49b /sw/inc/accmap.hxx
parentsw33a11y01: #i108125# - include new source file <parachangetrackinfo.cxx> int... (diff)
parentCWS-TOOLING: integrate CWS changefileheader2 (diff)
downloadcore-5879e44bafec55e5a9b76cb38c992645948ec607.tar.gz
core-5879e44bafec55e5a9b76cb38c992645948ec607.zip
sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master
Diffstat (limited to 'sw/inc/accmap.hxx')
-rw-r--r--sw/inc/accmap.hxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 0c6f3b698d15..01c4593fe636 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.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: accmap.hxx,v $
- * $Revision: 1.29 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify