summaryrefslogtreecommitdiff
path: root/sw/inc/docsh.hxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
commit23fe49e15145fce54048c44c49ca0fb09f03c2c2 (patch)
tree9f9ce34fe8626f75c6b4c6effefe1dffb95196e3 /sw/inc/docsh.hxx
parentd2137e0c3414c5c3d1ba55569316baa4eaf99f5f (diff)
parent7fa96e56c6fe20ea496be40338124ba35aae9d84 (diff)
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'sw/inc/docsh.hxx')
-rw-r--r--sw/inc/docsh.hxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 8eaa48c339c2..16e6cd047fb6 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.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: docsh.hxx,v $
- * $Revision: 1.48.72.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify