summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-12-16 11:47:49 +0000
committerRüdiger Timm <rt@openoffice.org>2004-12-16 11:47:49 +0000
commit1a84c3ca1d93f173d3328c55896f77ca86e6d9af (patch)
tree6293c2833c070e2c119b10fd9cb7d466c1522f7f
parent437d83d08ac29f3e0006ba9ab2aba3aa66196064 (diff)
INTEGRATION: CWS helpaux (1.3.16); FILE MERGED
2004/12/08 17:42:29 fpe 1.3.16.4: updated makefiles 2004/12/08 12:08:56 fpe 1.3.16.3: conflict resolve 2004/12/07 13:37:27 fpe 1.3.16.2: RESYNC: (1.3-1.4); FILE MERGED 2004/11/30 18:30:35 fpe 1.3.16.1: *** empty log message ***
-rw-r--r--helpcontent2/source/text/sbasic/guide/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpcontent2/source/text/sbasic/guide/makefile.mk b/helpcontent2/source/text/sbasic/guide/makefile.mk
index 0a99a78a53..c9920a435a 100644
--- a/helpcontent2/source/text/sbasic/guide/makefile.mk
+++ b/helpcontent2/source/text/sbasic/guide/makefile.mk
@@ -3,9 +3,9 @@
#* $Workfile:$
#*
#* Creation date KR 28.06.99
-#* last change $Author: rt $ $Date: 2004-11-26 14:39:47 $
+#* last change $Author: rt $ $Date: 2004-12-16 12:47:49 $
#*
-#* $Revision: 1.4 $
+#* $Revision: 1.5 $
#*
#* $Logfile:$
#*
@@ -27,8 +27,8 @@ MODULE = sbasic
# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/settings.pmk
.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/settings.pmk
# this list matches the *.xhp files to process
HZIPFILES = \