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