diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:03:27 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:03:27 +0200 |
| commit | 52c373716284ab940cbf521d5e9bafd2a789ed8b (patch) | |
| tree | 397e44dabd5f3f69986fc846bfe3653a0927dc94 | |
| parent | 7e2e14b0ff9eae4182e29a6e901e8fa49ff9b0f3 (diff) | |
jl152 #i77196# fixing merge conflicts
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 | ||||
| -rwxr-xr-x | scp2/source/ooo/file_ooo.scp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d3a679008..402252544 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -43,7 +43,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_C05_Faq, gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extension, - gid_Brand_Dir_Share_Extension_Install, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, @@ -297,6 +296,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_It DosName = "dict-it"; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr + ParentID = gid_Brand_Dir_Share_Extensions; + DosName = "dict-ku-TR"; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Lt ParentID = gid_Brand_Dir_Share_Extensions; DosName = "dict-lt"; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ae5b2d9dd..cc0f0507b 100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1999,7 +1999,7 @@ End #ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ku_Tr - Dir = gid_Brand_Dir_Share_Extension_Install; + Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr; Name = "dict-ku-TR.oxt"; Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE); UnixRights = 444; |