diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-23 10:57:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-23 10:57:48 +0000 |
| commit | 205348d71c5d5f9fb3166597daac7f5de5c8d84e (patch) | |
| tree | d31f36c86f363a44737741b11139323d3fba01be /setup_native/source | |
| parent | ecff07abeeb54ccf0b42aa7a6acd6d7074d261c7 (diff) | |
#i10000#
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/makefile.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index 4a100058374d..0f280177a0d6 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -68,14 +68,10 @@ SLOFILES = \ $(SLO)$/layerlinks.obj \ $(SLO)$/dotnetcheck.obj \ $(SLO)$/registerextensions.obj \ -<<<<<<< .working $(SLO)$/copyeditiondata.obj \ $(SLO)$/checkrunningoffice.obj \ - $(SLO)$/checkpatches.obj -======= - $(SLO)$/copyeditiondata.obj \ + $(SLO)$/checkpatches.obj \ $(SLO)$/copyextensiondata.obj ->>>>>>> .merge-right.r266571 STDSHL += \ $(ADVAPI32LIB)\ |