From 67f80daa409bf2dafb98bdbb5694fe70e921a2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 16 Dec 2004 11:48:19 +0000 Subject: [PATCH] INTEGRATION: CWS helpaux (1.3.16); FILE MERGED 2004/12/08 17:42:30 fpe 1.3.16.4: updated makefiles 2004/12/08 12:08:56 fpe 1.3.16.3: conflict resolve 2004/12/07 14:26:39 fpe 1.3.16.2: RESYNC: (1.3-1.4); FILE MERGED 2004/11/30 18:30:36 fpe 1.3.16.1: *** empty log message *** --- helpcontent2/source/text/sbasic/shared/01/makefile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpcontent2/source/text/sbasic/shared/01/makefile.mk b/helpcontent2/source/text/sbasic/shared/01/makefile.mk index f168dd79e0..4517f2a526 100644 --- a/helpcontent2/source/text/sbasic/shared/01/makefile.mk +++ b/helpcontent2/source/text/sbasic/shared/01/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: rt $ $Date: 2004-11-26 15:45:16 $ +#* last change $Author: rt $ $Date: 2004-12-16 12:48:19 $ #* -#* $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 = \