User: kz Date: 2008-04-04 15:03:01+0000 Modified: dba/dbaccess/util/makefile.mk
Log: INTEGRATION: CWS titles02 (1.32.10); FILE MERGED 2008/02/29 11:01:14 as 1.32.10.2: RESYNC: (1.32-1.33); FILE MERGED 2007/12/10 11:37:34 oj 1.32.10.1: #i45909# #i45617# #i71469# change title handling File Changes: Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.35&r2=1.36 Delta lines: +5 -0 ------------------- --- makefile.mk 2008-03-25 14:14:39+0000 1.35 +++ makefile.mk 2008-04-04 15:02:58+0000 1.36 @@ -75,7 +75,11 @@ $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) \ +<<<<<<< makefile.mk $(BASICLIB) \ +======= + $(FWELIB) \ +>>>>>>> 1.32.10.2 $(SALHELPERLIB) SHL1LIBS=$(LIB1TARGET) @@ -114,6 +118,7 @@ $(SFXLIB) \ $(BASICLIB) \ $(SVTOOLLIB) \ + $(FWELIB) \ $(TKLIB) \ $(VCLLIB) \ $(GOODIESLIB) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
