summaryrefslogtreecommitdiff
path: root/libwpd
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:18:56 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:18:56 +0000
commit636d0e60a75b3277caeb1bd6aab67aaba8ef5043 (patch)
tree9e4a7e44e755e2790ebf890a7e4b9afb04aa9423 /libwpd
parent1d70e3c70d81fbe555fb4b6b182cb850b18b21c9 (diff)
INTEGRATION: CWS warnings01 (1.7.2); FILE MERGED
2006/01/26 17:27:28 sb 1.7.2.5: #i53898# Fixed previous merge. 2006/01/25 20:30:57 sb 1.7.2.4: RESYNC: (1.9-1.10); FILE MERGED 2005/11/07 18:56:29 pl 1.7.2.3: RESYNC: (1.8-1.9); FILE MERGED 2005/09/22 20:33:02 sb 1.7.2.2: RESYNC: (1.7-1.8); FILE MERGED 2005/08/29 13:44:34 sb 1.7.2.1: #i53898# Disabled werror within external code.
Diffstat (limited to 'libwpd')
-rw-r--r--libwpd/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 0b1f072c8ae8..32445287bbfb 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: obo $ $Date: 2006-01-20 10:05:43 $
+# last change: $Author: hr $ $Date: 2006-06-20 00:18:56 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,7 @@ TARGET=wpd
.ENDIF
TARFILE_NAME=libwpd-0.8.4
-#PATCH_FILE_NAME=$(TARFILE_NAME).diff
+PATCH_FILE_NAME=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib