summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-08-18 07:13:08 +0000
committerRüdiger Timm <rt@openoffice.org>2005-08-18 07:13:08 +0000
commit0fa75108e7451f4a9ec12aba792ac267a1645538 (patch)
tree0e192ce909784961785ba5020d27fb1b4d47ec7c /scp2/source
parent3c9461315b61877c1db6d6bfe3204464097aa86b (diff)
INTEGRATION: CWS macosx10 (1.23.28); FILE MERGED
2005/07/25 12:05:43 tra 1.23.28.2: RESYNC: (1.23-1.24); FILE MERGED 2005/07/19 21:38:14 ericb 1.23.28.1: #i48285# san680*.res are needed since scanner works on Mac OSX
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp8
1 files changed, 2 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 6a317c0c8392..706e83b40a7d 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -2,9 +2,9 @@
*
* $RCSfile: file_resource_ooo.scp,v $
*
-* $Revision: 1.24 $
+* $Revision: 1.25 $
*
-* last change: $Author: obo $ $Date: 2005-07-18 12:31:30 $
+* last change: $Author: rt $ $Date: 2005-08-18 08:13:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -126,14 +126,10 @@ STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
#ifdef UNX
-#ifndef MACOSX
-
STD_RES_FILE( gid_File_Res_San, san )
#endif
-#endif
-
STD_RES_FILE( gid_File_Res_Sch, sch )
//