User: rt      
Date: 2007-07-06 08:37:37+0000
Modified:
   dba/dbaccess/source/ui/misc/makefile.mk

Log:
 INTEGRATION: CWS oj14 (1.25.4); FILE MERGED
 2007/06/04 18:49:51 oj 1.25.4.6: RESYNC: (1.28-1.29); FILE MERGED
 2006/11/08 11:15:28 oj 1.25.4.5: merge conflicts resolved
 2006/11/07 09:38:47 oj 1.25.4.4: RESYNC: (1.26-1.28); FILE MERGED
 2006/07/04 08:15:32 oj 1.25.4.3: RESYNC: (1.25-1.26); FILE MERGED
 2006/03/20 07:48:49 oj 1.25.4.2: use of module client helper
 2006/01/03 07:49:21 oj 1.25.4.1: changed module client

File Changes:

Directory: /dba/dbaccess/source/ui/misc/
========================================

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/makefile.mk?r1=1.29&r2=1.30
Delta lines:  +1 -0
-------------------
--- makefile.mk 2007-05-10 10:36:40+0000        1.29
+++ makefile.mk 2007-07-06 08:37:35+0000        1.30
@@ -43,6 +43,7 @@
 # --- Settings ----------------------------------
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 # --- Files -------------------------------------
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to