71a43f77ad
Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt solenv/inc/minor.mk |
||
---|---|---|
.. | ||
unix | ||
windows |
71a43f77ad
Conflicts: instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt solenv/inc/minor.mk |
||
---|---|---|
.. | ||
unix | ||
windows |