diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
| commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
| tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/util/simpress/makefile.mk | |
| parent | d55766ce22ef3ed771938e5ad60f6b776bab38ad (diff) | |
| parent | 13e0998c215eb9419fce0ca6a4fc0d69a18356d5 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/util/simpress/makefile.mk')
| -rw-r--r-- | helpcontent2/util/simpress/makefile.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index 9691acde22..df0528c229 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -307,17 +307,11 @@ LINKLINKFILES= \ text$/shared$/00$/00000020.xhp \ text$/shared$/00$/00000021.xhp \ text$/shared$/00$/00000099.xhp \ - text$/shared$/00$/00000202.xhp \ - text$/shared$/00$/00000203.xhp \ - text$/shared$/00$/00000204.xhp \ - text$/shared$/00$/00000205.xhp \ + text$/shared$/00$/00000200.xhp \ text$/shared$/00$/00000206.xhp \ text$/shared$/00$/00000207.xhp \ text$/shared$/00$/00000208.xhp \ text$/shared$/00$/00000210.xhp \ - text$/shared$/00$/00000212.xhp \ - text$/shared$/00$/00000213.xhp \ - text$/shared$/00$/00000214.xhp \ text$/shared$/00$/00000215.xhp \ text$/shared$/00$/00000401.xhp \ text$/shared$/00$/00000402.xhp \ @@ -1093,6 +1087,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ |