diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-04-18 02:16:38 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-20 00:00:01 +0100 |
| commit | a8a5503062aa7b8775c470f29d2caaa7a9acfab1 (patch) | |
| tree | 78786025141ae7b7808fed9d3c1f1196ba8bb335 /solenv | |
| parent | Collabora Office ARP data (diff) | |
| download | core-a8a5503062aa7b8775c470f29d2caaa7a9acfab1.tar.gz core-a8a5503062aa7b8775c470f29d2caaa7a9acfab1.zip | |
Collabora Office EULA
Conflicts:
readlicense_oo/Package_files.mk
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
(cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6)
(cherry picked from commit 63f4de72939a506c04d7f1b274e9c8fa09c4bb25)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/idtglobal.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 8cbfcb24b2b8..f87becd0aa3e 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -813,7 +813,7 @@ sub get_rtflicensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "license_" . $language . ".rtf"; + my $licensefilename = "EULA_en-US.rtf"; my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1); |