summaryrefslogtreecommitdiffstats
path: root/helpcontent2/source/text/shared/makefile.mk
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-12-16 11:52:36 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-12-16 11:52:36 +0000
commitb0bb2bdf2298877dd8594e1cb5060be872b39084 (patch)
treea508d0564b6b8b6fc276ead73fee745e66297627 /helpcontent2/source/text/shared/makefile.mk
parentINTEGRATION: CWS helpaux (1.3.16); FILE MERGED (diff)
downloadhelp-b0bb2bdf2298877dd8594e1cb5060be872b39084.tar.gz
help-b0bb2bdf2298877dd8594e1cb5060be872b39084.zip
INTEGRATION: CWS helpaux (1.3.16); FILE MERGED
2004/12/13 15:08:30 fpe 1.3.16.4: RESYNC: (1.3-1.4); FILE MERGED 2004/12/08 17:42:43 fpe 1.3.16.3: updated makefiles 2004/12/08 12:09:08 fpe 1.3.16.2: conflict resolve 2004/11/30 18:30:43 fpe 1.3.16.1: *** empty log message ***
Diffstat (limited to 'helpcontent2/source/text/shared/makefile.mk')
-rw-r--r--helpcontent2/source/text/shared/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index f8c11933fa..1e5c84c532 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -3,9 +3,9 @@
#* $Workfile:$
#*
#* Creation date KR 28.06.99
-#* last change $Author: rt $ $Date: 2004-11-26 20:20:50 $
+#* last change $Author: rt $ $Date: 2004-12-16 12:52:36 $
#*
-#* $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 = \