diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:31:41 +0100 |
commit | d856c71a7de5a89a855ab84e5c99a187675fb3e6 (patch) | |
tree | 524da5c1452039059ff3038234eac75f63ede64b /scp2/source/extensions/file_extensions.scp | |
parent | 91b54d2c173401ef026f4dd6c01b5aadcd150db9 (diff) | |
parent | 3335c0b182814ef724d425b24abe3070cb4e83dc (diff) |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
configure.in
solenv/bin/build.pl
Diffstat (limited to 'scp2/source/extensions/file_extensions.scp')
-rw-r--r-- | scp2/source/extensions/file_extensions.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 85b31a860c5f..cb5cd33ed479 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -111,9 +111,9 @@ End File gid_File_Oxt_LightProof TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Install; - Name (hu) = "lightproof-hu-1.2.oxt"; + Dir = gid_Brand_Dir_Share_Extensions_LightProof; Name (en-US) = "lightproof-en-US-0.1.oxt"; + Name (hu) = "lightproof-hu-1.2.oxt"; End #endif @@ -216,7 +216,7 @@ End File gid_File_Oxt_Barcode TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Validator; + Dir = gid_Brand_Dir_Share_Extensions_Barcode; Name = "Barcode.oxt"; End |