summaryrefslogtreecommitdiff
path: root/registry/tools/regmerge.cxx
diff options
context:
space:
mode:
authorMatthias Huetsch [mhu] <matthias.huetsch@sun.com>2010-03-04 19:36:24 +0100
committerMatthias Huetsch [mhu] <matthias.huetsch@sun.com>2010-03-04 19:36:24 +0100
commit6d03994e21a228a5e28e1735fb3fe5ee2b517087 (patch)
tree72b490941cb0cde0842f28c66d966b595d873ce7 /registry/tools/regmerge.cxx
parent709ee7e9b098fa7074d84d3faab7aa5cd5ebf73b (diff)
parent5284d1d961e434f53992f6db762e2c15fd4823dd (diff)
mhu22: resync to master repository (DEV300_m73).
Diffstat (limited to 'registry/tools/regmerge.cxx')
-rw-r--r--registry/tools/regmerge.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 4fcb19a03c00..06786a9b993e 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -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: regmerge.cxx,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify