diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-18 07:05:04 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-18 08:21:57 +0200 |
| commit | 606852089e32a2065ee5fc3224f7b2940e6b1323 (patch) | |
| tree | af99a06bab220e509c07997d49c6f3f85a052084 /scp2 | |
| parent | 55b9706bea5aa9b654ab39bc7d56339422e17087 (diff) | |
Revert two last changes to Upgrade table
This reverts commits 914f6385d98f8c898102c971a4d5b0eb9f075ef0 and
a6045159237419ce8fa49202c672e3895f0ab30a. A investigation required why
is the problem with them; meanwhile, they break builds.
Change-Id: I713b27dd64e8ac7beb2757c362765b60ce191f8d
Reviewed-on: https://gerrit.libreoffice.org/53078
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index c4750ff5ad69..921a9433e820 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist Source = VCREDIST_EXE_NAME; Target = "/repair /norestart /passive"; Inbinarytable = 1; - Assignment1 = ("InstallUISequence", "Not Installed And Not ( (VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction"); + Assignment1 = ("InstallUISequence", "Not Installed And Not ( VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction"); End #endif |