summaryrefslogtreecommitdiff
path: root/framework/inc/classes/resource.hrc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-06-10 15:20:40 +0000
committerKurt Zenker <kz@openoffice.org>2004-06-10 15:20:40 +0000
commit76b3c0b5237e66304aeb89c015bbac12c0058f95 (patch)
tree52a755815b1301d232f6ef148afc4551cdccc86a /framework/inc/classes/resource.hrc
parentf59e3bef6ac796c54ff894aab6b1a57f912f23c9 (diff)
INTEGRATION: CWS fwk02ea (1.3.28); FILE MERGED
2004/06/01 15:31:27 lo 1.3.28.1: #i29643# #i26375# licens dialog behavior + helpids
Diffstat (limited to 'framework/inc/classes/resource.hrc')
-rw-r--r--framework/inc/classes/resource.hrc5
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 62341ff9a51a..cc1cb4fceba1 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: resource.hrc,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: kz $ $Date: 2004-06-10 16:19:02 $
+ * last change: $Author: kz $ $Date: 2004-06-10 16:20:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,4 +85,3 @@
#define PB_DECLINE (RID_FWK_DIALOG_START+22)
#define PB_ACCEPT (RID_FWK_DIALOG_START+23)
->>>>>>> 1.3.28.1