diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 12:35:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 12:35:13 +0000 |
| commit | 835162750f711f869f04d2ebb04f17f7e5fec170 (patch) | |
| tree | 8be542492a5e72ece1833f8b3b1e96858388dece /solenv/bin/modules/pre2par | |
| parent | 708fd2b1890a59fa4a6ae7556e603c811b479579 (diff) | |
INTEGRATION: CWS native116 (1.11.104); FILE MERGED
2007/10/10 15:12:06 is 1.11.104.1: #i82313# preparing merge module integration
Diffstat (limited to 'solenv/bin/modules/pre2par')
| -rw-r--r-- | solenv/bin/modules/pre2par/globals.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm index fa043e19b13f..624f4653d621 100644 --- a/solenv/bin/modules/pre2par/globals.pm +++ b/solenv/bin/modules/pre2par/globals.pm @@ -4,9 +4,9 @@ # # $RCSfile: globals.pm,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: ihi $ $Date: 2007-07-12 11:17:41 $ +# last change: $Author: ihi $ $Date: 2007-11-23 13:35:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,8 @@ BEGIN @allitems = ("Installation", "ScpAction", "HelpText", "Directory", "DataCarrier", "StarRegistry", "File", "Shortcut", "Custom", "Unixlink", "Procedure", "Module", "Profile", "ProfileItem", - "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction"); + "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction", + "MergeModule"); $logging = 0; $logfilename = "logfile.log"; # the default logfile name for global errors |