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