User: kz Date: 2008-04-04 15:04:29+0000 Modified: dba/dbaccess/util/makefile.mk
Log: #i10000# conflicts fixed File Changes: Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.36&r2=1.37 Delta lines: +0 -3 ------------------- --- makefile.mk 2008-04-04 15:02:58+0000 1.36 +++ makefile.mk 2008-04-04 15:04:27+0000 1.37 @@ -75,11 +75,8 @@ $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) \ -<<<<<<< makefile.mk $(BASICLIB) \ -======= $(FWELIB) \ ->>>>>>> 1.32.10.2 $(SALHELPERLIB) SHL1LIBS=$(LIB1TARGET) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
