70896c190c
Conflicts: configure.in scp2/source/extensions/directory_extensions.scp scp2/source/extensions/module_extensions.scp scp2/source/ooo/file_ooo.scp set_soenv.in solenv/bin/modules/installer/download.pm solenv/bin/modules/installer/helppack.pm solenv/bin/modules/installer/windows/createfolder.pm solenv/bin/modules/installer/worker.pm solenv/bin/ooinstall |
||
---|---|---|
.. | ||
makefile.mk | ||
openoffice.lst | ||
pack.lst | ||
update.xml |