summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:53:22 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:53:22 +0000
commit46e495110f097624dbf650272176bd5f29b736a6 (patch)
tree1850daf48414ab244c042c7f9b64f0c852cd2c05 /scp2
parenta1667dfdb3075d68df543be13db5cfae8289a41b (diff)
INTEGRATION: CWS warnings01 (1.42.28); FILE MERGED
2006/06/14 12:10:40 cl 1.42.28.3: #i66421# added missing gallery resource to patch 2006/05/24 00:56:54 sb 1.42.28.2: RESYNC: (1.42-1.43); FILE MERGED 2006/05/15 13:21:03 sb 1.42.28.1: #i53898# lgd (framework) has been removed
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 369589190a1f..b4faf8e6013c 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: file_resource_ooo.scp,v $
*
- * $Revision: 1.43 $
+ * $Revision: 1.44 $
*
- * last change: $Author: rt $ $Date: 2006-05-05 08:53:00 $
+ * last change: $Author: hr $ $Date: 2006-06-20 04:53:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -65,15 +65,13 @@ STD_RES_FILE_PATCH( gid_File_Res_Fwe, fwe)
STD_RES_FILE( gid_File_Res_Fps_Office, fps_office)
-STD_RES_FILE( gid_File_Res_Gal, gal )
+STD_RES_FILE_PATCH( gid_File_Res_Gal, gal )
STD_RES_FILE_PATCH( gid_File_Res_Imp, imp )
STD_RES_FILE( gid_File_Res_Deployment, deployment )
STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
-STD_RES_FILE( gid_File_Res_Lgd, lgd )
-
STD_RES_FILE_PATCH( gid_File_Res_Ofa, ofa )
STD_RES_FILE( gid_File_Res_Ooo, ooo )