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 /scp2 | |
| parent | a0bf6f1f0cf1ad3ed348b1eaf6a662cd3a20fb11 (diff) | |
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 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6424960686f5..389afafad654 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1287,6 +1287,19 @@ File gid_License_Txt Styles = (PACKED); End +File gid_Eula_Odt + BIN_FILE_BODY; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Dir_Bundle_Contents_Resources; +#elif defined MACOSX + Dir = gid_Dir_Bundle_Contents; +#else + Dir = gid_Dir_Brand_Root; +#endif + Name = "EULA.odt"; + Styles = (PACKED); +End + File gid_License_Odt TXT_FILE_BODY; #if defined MACOSX |