summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-05-15 17:05:17 +0200
committerAndras Timar <andras.timar@collabora.com>2016-03-04 13:34:48 +0100
commitea1ca253d3b24fd64cf6678785e4170f42ee06f9 (patch)
tree404d38ff51316d87ed64a11010c1b9596011178f /scp2
parent606efa8fb419a154a9bb285a3ea8f6a5bab3c8c2 (diff)
shell script in Contents/MacOS is not accepted
(cherry picked from commit c5d91c02192f4272ad2a200beffa059a7dc7a146) Conflicts: scp2/source/ooo/file_ooo.scp Change-Id: Ib047b763bfeff9dbf43db8fc11e6fd7f1fa179f8
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_ooo.scp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ce009ddd99ac..4f6a1eece4a1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -59,7 +59,7 @@ End
#endif
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;