diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
commit | fc1e9f253dd07362065f2be9691be89fb9b3f84f (patch) | |
tree | 89ff0b4e6733af107e34d1513df55479951b5221 /solenv/bin/modules/installer/globals.pm | |
parent | 535bee89a2f5aab6f997688313e47343cef298ea (diff) | |
parent | 5c8186bdd389fc05224d33add32e944d3f96dc27 (diff) |
Merge branch 'DEV300_m106' into libreoffice-3-4
Conflicts:
Module_ooo.mk
Repository.mk
configure
configure.in
ooo.lst
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
solenv/config/sdev300.ini
solenv/config/ssolar.cmn
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/JunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/inc/minor.mk
Diffstat (limited to 'solenv/bin/modules/installer/globals.pm')
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 2f7249c24f47..ace634a3ac5e 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -94,7 +94,8 @@ BEGIN "fur", "ny", "so", - "kab" + "kab", + "tk" ); @items_at_modules = ("Files", "Dirs", "Unixlinks"); @asianlanguages = ("ja", "ko", "zh-CN", "zh-TW"); @@ -385,6 +386,10 @@ BEGIN %allcomponents_in_this_database = (); %allshortcomponents = (); %alluniquedirectorynames = (); + %allregistrycomponents_ = (); + %allregistrycomponents_in_this_database_ = (); + %allshortregistrycomponents = (); + %allregistryidentifier = (); $installlocationdirectory = ""; $installlocationdirectoryset = 0; |