summaryrefslogtreecommitdiff
path: root/helpcontent2
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-12-16 11:57:04 +0000
committerRüdiger Timm <rt@openoffice.org>2004-12-16 11:57:04 +0000
commit7c8dcb41ab19154390a79478c447c01870510ccb (patch)
tree47bac19dfee8a6456f83aed5d49c7806749b4048 /helpcontent2
parent34288915f49f1f9c275b28592b54e1de939c141c (diff)
INTEGRATION: CWS helpaux (1.3.16); FILE MERGED
2004/12/08 17:42:50 fpe 1.3.16.4: updated makefiles 2004/12/08 12:09:16 fpe 1.3.16.3: conflict resolve 2004/12/07 12:44:29 fpe 1.3.16.2: RESYNC: (1.3-1.4); FILE MERGED 2004/11/30 18:30:52 fpe 1.3.16.1: *** empty log message ***
Diffstat (limited to 'helpcontent2')
-rw-r--r--helpcontent2/source/text/simpress/guide/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpcontent2/source/text/simpress/guide/makefile.mk b/helpcontent2/source/text/simpress/guide/makefile.mk
index 3a3543f89e..9ed89a72b7 100644
--- a/helpcontent2/source/text/simpress/guide/makefile.mk
+++ b/helpcontent2/source/text/simpress/guide/makefile.mk
@@ -3,9 +3,9 @@
#* $Workfile:$
#*
#* Creation date KR 28.06.99
-#* last change $Author: rt $ $Date: 2004-11-26 23:20:32 $
+#* last change $Author: rt $ $Date: 2004-12-16 12:57:04 $
#*
-#* $Revision: 1.4 $
+#* $Revision: 1.5 $
#*
#* $Logfile:$
#*
@@ -27,8 +27,8 @@ MODULE = simpress
# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/settings.pmk
.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/settings.pmk
# this list matches the *.xhp files to process
HZIPFILES = \