summaryrefslogtreecommitdiff
path: root/scp2/source/ooo/file_resource_ooo.scp
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
commitb6fb876a55bf70003e42fd23786324b746b24aff (patch)
tree578eed0a31b3e5ed0a4fa3b6c82d2accebdfa22b /scp2/source/ooo/file_resource_ooo.scp
parenta21837c887d5268b4ec05c03c09af02a42fc0198 (diff)
parent213c9f9662001c25bf37b8e35ec779a39b764d8e (diff)
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'scp2/source/ooo/file_resource_ooo.scp')
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp6
1 files changed, 0 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 3790a28bd80a..cbd8ff609721 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -45,12 +45,6 @@ STD_RES_FILE( gid_File_Res_Dbw, dbw )
STD_RES_FILE( gid_File_Res_Dkt, dkt)
-STD_RES_FILE( gid_File_Res_Epb, epb )
-
-STD_RES_FILE( gid_File_Res_Epg, epg )
-
-STD_RES_FILE( gid_File_Res_Epp, epp )
-
STD_RES_FILE( gid_File_Res_Eur, eur )
STD_RES_FILE( gid_File_Res_Frm, frm)