summaryrefslogtreecommitdiff
path: root/svx/inc/globlmn_tmpl.hrc
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
commite0bbca69924d4e4417fd80268b7c0191f1f45dd5 (patch)
treefe7830fac467ef544d9df8e0cef619dd1fa9935b /svx/inc/globlmn_tmpl.hrc
parent2f2e8c1dfda3fd27cf182f136132ad7f34975494 (diff)
parent033ae7933d91aad60d1c4ac3bd9b87a64b751272 (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 'svx/inc/globlmn_tmpl.hrc')
-rw-r--r--svx/inc/globlmn_tmpl.hrc7
1 files changed, 2 insertions, 5 deletions
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 128c5c5ded..41d0d42bdf 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1,14 +1,11 @@
/*************************************************************************
*
* 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: globlmn_tmpl.hrc,v $
- * $Revision: 1.11.212.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify