diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-13 13:08:02 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-13 17:41:53 +0200 |
| commit | d4a72f99c96622ac372eafe9494246df2e8cbb89 (patch) | |
| tree | 126bf9a6f38a29693cfa633575c76004c6676836 /cui | |
| parent | Use registry key to track installed state of gm_SharePointSupport_SubstMSO (diff) | |
| download | core-d4a72f99c96622ac372eafe9494246df2e8cbb89.tar.gz core-d4a72f99c96622ac372eafe9494246df2e8cbb89.zip | |
Merge both x64 and x86 CRT merge modules into x64 MSI
... because it contains x86 binaries in addition to x64: e.g., twain32shim,
spsupp_x86.
The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see
https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI.
Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit a4681e8b74a59439110af42ff18cce021512056d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86680
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'cui')
0 files changed, 0 insertions, 0 deletions