summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 12:08:52 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 12:08:52 +0000
commitc3d64de4c8531069e2ff134bd27d034ecbd00aff (patch)
treee1350055ee7059f7031456f206955f64a6f1b3cf /setup_native
parent2b10987227dff7f7676738c7602b203870e8e9f9 (diff)
INTEGRATION: CWS nativefixer18 (1.4.6); FILE MERGED
2005/09/26 11:56:18 is 1.4.6.2: RESYNC: (1.4-1.5); FILE MERGED 2005/08/16 14:59:07 is 1.4.6.1: #124911# Windows patch has to find older patches
Diffstat (limited to 'setup_native')
-rwxr-xr-xsetup_native/source/win32/customactions/patch/makefile.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index c601a48b4092..4c07992b2aaa 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: rt $ $Date: 2005-09-07 16:33:12 $
+# last change: $Author: hr $ $Date: 2005-09-28 13:08:52 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -56,7 +56,8 @@ UWINAPILIB=
SLOFILES = \
$(SLO)$/swappatchfiles.obj \
- $(SLO)$/respintest.obj
+ $(SLO)$/respintest.obj \
+ $(SLO)$/upgrade.obj
SHL1STDLIBS= kernel32.lib\