helpcontent2 | 2 +- scp2/inc/macros.inc | 2 +- scp2/source/ooo/file_ooo.scp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit cd56601f6254e216f586b2b2d4ab9fa90893b41d Author: Caolán McNamara <[email protected]> Date: Wed Sep 11 14:50:20 2013 +0100 Updated core Project: help 29aa4cb0cf80b9733dc1feff3e61479c189d85ec diff --git a/helpcontent2 b/helpcontent2 index d7cdc2f..29aa4cb 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d7cdc2fbf36d81ecfdfa92bdf07e8471aa380ce5 +Subproject commit 29aa4cb0cf80b9733dc1feff3e61479c189d85ec commit e5f580d2db48ae339bb25bd39467b85af1d54865 Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 17:28:26 2013 +0200 FILELIST_DIR: gb_INSTROOT already cont. LibreOffice.app/Contents on OS X Change-Id: I2753079ff532642c8fb1b43f02211197cdb2702a diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3659dc2..3b34334 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -460,7 +460,7 @@ End #endif #if defined MACOSX -#define FILELIST_DIR gid_Dir_Bundle_Contents +#define FILELIST_DIR PREDEFINED_PROGDIR #define FILELIST_SDK_DIR PREDEFINED_PROGDIR #else #define FILELIST_DIR gid_Dir_Brand_Root commit 04cb006f990efd518eac154abf1449c6ca84d8ae Author: Stephan Bergmann <[email protected]> Date: Wed Sep 11 17:00:00 2013 +0200 Consistency (though FILELIST_DIR = gid_Dir_Bundle_Contents on MACOSX anyway) Change-Id: Ifd2373ffa819d63591d234df18adf5f9a34c50bb diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 11416d6..65d1e7f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -723,7 +723,7 @@ End #ifdef MACOSX File gid_File_App_InfoPlist TXT_FILE_BODY; - Dir = gid_Dir_Bundle_Contents; + Dir = FILELIST_DIR; Name = "infoplist.filelist"; Styles = (FILELIST); End
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
