diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 11:48:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 11:48:05 +0000 |
| commit | 3093e9cc7b8bda8299f6d9e97be7723d3614f2f8 (patch) | |
| tree | 5991b33804a44141e1b3c837bf02fea59c28a2d4 /setup_native/source/win32/customactions/shellextensions/makefile.mk | |
| parent | d6e991abd0d161cf316660d689e5b2a790a4f132 (diff) | |
CWS-TOOLING: integrate CWS native214
2009-01-05 16:05:30 +0100 is r265877 : #i97060# version number 3.1 instead of 3.0
2009-01-05 14:02:05 +0100 is r265868 : #i97060# 3.1 also for slackware packages
2008-12-15 13:47:31 +0100 is r265482 : #i94714# adding string
2008-12-15 10:40:59 +0100 is r265464 : #i94746# math.desktop for all products
2008-12-12 14:31:01 +0100 is r265418 : #i94871# adjust image for dmg file
2008-12-12 13:02:05 +0100 is r265409 : #i92038# avoiding sending mails to root
2008-12-12 12:43:58 +0100 is r265408 : #158469# removing registry entries for wps and ichitaro
2008-12-12 12:36:13 +0100 is r265407 : #i95257# adding Mongolian as nsis language
2008-12-11 15:59:57 +0100 is r265325 : #89742# fixing typo
2008-12-11 15:54:43 +0100 is r265324 : #i89732# minor string fixes
2008-12-11 15:35:29 +0100 is r265320 : #i97060# gnome also for user installation required
2008-12-11 12:34:36 +0100 is r265283 : #i96575# removing superfluous dependencies
2008-12-10 15:31:04 +0100 is r265196 : #i96306# adding Gaelic
2008-12-10 14:35:28 +0100 is r265187 : #i94776# ure version 1.5
2008-12-10 11:40:47 +0100 is r265161 : #158920# new extension process
2008-12-10 11:38:46 +0100 is r265160 : #158920# new extension process
2008-12-10 11:37:32 +0100 is r265159 : #158920# new extension process
2008-12-09 13:05:20 +0100 is r265077 : #i94453# longer textbox
2008-12-09 12:41:35 +0100 is r265076 : #i97060# setting version 3.1.0
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/makefile.mk')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/makefile.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index f8a9e6b0ae5a..9d286a349b67 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -66,9 +66,14 @@ SLOFILES = \ $(SLO)$/layerlinks.obj \ $(SLO)$/dotnetcheck.obj \ $(SLO)$/registerextensions.obj \ +<<<<<<< .working $(SLO)$/copyeditiondata.obj \ $(SLO)$/checkrunningoffice.obj \ $(SLO)$/checkpatches.obj +======= + $(SLO)$/copyeditiondata.obj \ + $(SLO)$/copyextensiondata.obj +>>>>>>> .merge-right.r266571 STDSHL += \ $(ADVAPI32LIB)\ |