summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/guide/main.xhp
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-08-14 14:56:29 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-08-14 14:56:29 +0000
commit4c060ce81159799cf5bb4f0337e55c5fb0582a61 (patch)
tree358c92ee002bbe01f64af9e78e0650f5d7c1dbb5 /helpcontent2/source/text/swriter/guide/main.xhp
parent5cc2934c91881fc5ae5e59c99cf4c43aab9ab191 (diff)
INTEGRATION: CWS hcshared01 (1.8.62); FILE MERGED
2006/08/14 14:38:40 ufi 1.8.62.2: RESYNC: (1.8-1.9); FILE MERGED 2006/03/24 13:50:29 ufi 1.8.62.1: *** empty log message ***
Diffstat (limited to 'helpcontent2/source/text/swriter/guide/main.xhp')
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/main.xhp8
1 files changed, 4 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/guide/main.xhp b/helpcontent2/source/text/swriter/guide/main.xhp
index 3452fc30b1..16be1b8aeb 100755
--- a/helpcontent2/source/text/swriter/guide/main.xhp
+++ b/helpcontent2/source/text/swriter/guide/main.xhp
@@ -6,9 +6,9 @@
*
* $RCSfile: main.xhp,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: ihi $ $Date: 2006-06-28 15:54:08 $
+ * last change: $Author: hr $ $Date: 2006-08-14 15:56:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -44,7 +44,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-17T16:38:24">converted from old format - fpe</lastedited>
+<lastedited date="2006-03-20T12:11:13">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -131,7 +131,7 @@
<embed href="text/swriter/guide/calculate_multitable.xhp#calculate_multitable"/>
<embed href="text/swriter/guide/calculate_intable.xhp#calculate_intable"/>
<embed href="text/swriter/guide/insert_beforetable.xhp#insert_beforetable"/>
-<embed href="text/shared/guide/table_cellmerge.xhp#table_cellmerge"/>
+<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
<embed href="text/swriter/guide/table_repeat_multiple_headers.xhp#table_repeat_multiple_headers"/>
<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>