diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:46:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:46:44 +0000 |
| commit | f5d255bffed9ecd9ce6cbfb0c0396a6ad0d5edac (patch) | |
| tree | 38cc21f425d1d0564ed2d221604593d6125cfc1b /scp2/source/base | |
| parent | 0b53f999ba2e5cf76cd2c51d2f3e42192911c2bb (diff) | |
INTEGRATION: CWS macosx20xfixes02 (1.11.12); FILE MERGED
2006/04/03 19:19:55 obr 1.11.12.1: #i63030# changed installation structure on osx and removed some X11 desktop integration stuff
Diffstat (limited to 'scp2/source/base')
| -rw-r--r-- | scp2/source/base/file_base.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index bbba2575e9b1..397acaea4829 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_base.scp,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: obo $ $Date: 2006-03-29 12:45:27 $ + * last change: $Author: kz $ $Date: 2006-04-26 20:46:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,7 +53,7 @@ STD_RES_FILE_PATCH( gid_File_Res_Dbu, dbu) STD_RES_FILE_PATCH( gid_File_Res_Cnr, cnr) -#ifdef UNX +#if defined UNX && ! defined MACOSX File gid_File_Share_Xdg_Base TXT_FILE_BODY; |