[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - scp2/source

[Andras Timar]

 scp2/source/ooo/common_brand.scp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5a33bf649b3311effbcfba86607a06c8c57514da
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 14 00:01:17 2015 +0200

    do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICE
    
    (cherry picked from commit cb5a0b03bef4eb8ab0d8689ec73ed83bb73ef5c0)
    
    Conflicts:
    	scp2/source/ooo/common_brand.scp
    
    Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5830bc9..7f0d8c0 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1411,7 +1411,7 @@ File gid_License_Txt
 End
 
 File gid_Eula_Odt
-    BIN_FILE_BODY;
+    TXT_FILE_BODY;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Dir = gid_Dir_Bundle_Contents_Resources;
 #elif defined MACOSX
@@ -1424,7 +1424,7 @@ File gid_Eula_Odt
 End
 
 File gid_License_Odt
-    BIN_FILE_BODY;
+    TXT_FILE_BODY;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Dir = gid_Dir_Bundle_Contents_Resources;
 #elif defined MACOSX
@@ -1437,7 +1437,7 @@ File gid_License_Odt
 End
 
 File gid_Credits_Odt
-    BIN_FILE_BODY;
+    TXT_FILE_BODY;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Dir = gid_Dir_Bundle_Contents_Resources;
 #elif defined MACOSX
@@ -1450,7 +1450,7 @@ File gid_Credits_Odt
 End
 
 File gid_Apache_Notice
-    BIN_FILE_BODY;
+    TXT_FILE_BODY;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Dir = gid_Dir_Bundle_Contents_Resources;
 #elif defined MACOSX