diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 09:47:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 09:47:41 +0200 |
| commit | 538d29f5a4d36a836124d49bb29e19a8954b34f9 (patch) | |
| tree | f46d3e9ac14031427ebdb0385ffbe076f79d99ba /scp2 | |
| parent | Prevent clang errors about promoted type incompatibilities of K&R function pa... (diff) | |
| download | core-538d29f5a4d36a836124d49bb29e19a8954b34f9.tar.gz core-538d29f5a4d36a836124d49bb29e19a8954b34f9.zip | |
Undo basis/brand split: move presets/ from basis to brand.
Also let utl::Bootstrap::locateBaseInstallation return
$BRAND_BASE_DIR instead of $OOO_BASE_DIR, so that things match again.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index b505095076c7..2d523951c7e5 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -172,9 +172,9 @@ End Directory gid_Dir_User #if defined MACOSX - ParentID = gid_Brand_Dir_BasisLink; + ParentID = gid_Dir_Bundle_Contents; #else - ParentID = gid_Dir_Ooo_Basis; + ParentID = gid_Dir_Brand_Root; #endif DosName = "presets"; End |