summaryrefslogtreecommitdiff
path: root/solenv/inc/shlinfo.rc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:36:02 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:36:02 +0000
commitaa990de8b702e69a8595a242997d413ef937f340 (patch)
tree67e33a08f9c72f4babe68358585a816228461e13 /solenv/inc/shlinfo.rc
parente1f24e95bfe923e3a919def0acabd3f345ae86a1 (diff)
INTEGRATION: CWS vcl13 (1.4.2); FILE MERGED
2003/06/23 12:35:59 hjs 1.4.2.1: #110337# version numbers
Diffstat (limited to 'solenv/inc/shlinfo.rc')
-rw-r--r--solenv/inc/shlinfo.rc69
1 files changed, 8 insertions, 61 deletions
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index eb6c8a1d0555..0a24f7f63e69 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -2,9 +2,9 @@
*
* $RCSfile: shlinfo.rc,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: vg $ $Date: 2003-06-20 10:33:45 $
+ * last change: $Author: hr $ $Date: 2003-06-30 14:36:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -60,7 +60,7 @@
************************************************************************/
#define VERSION 7
-#define SUBVERSION 0
+//#define SUBVERSION 0
//#define VERVARIANT 0
// .0 + VER_CONCEPT
@@ -115,8 +115,13 @@ RCD_LANGUAGE rcdata
// -----------------------------------------------------------------------
VS_VERSION_INFO versioninfo
+#ifndef SUBVERSION
+ fileversion VERSION, 0, 0, VERVARIANT
+ productversion VERSION, 0, 0, VERVARIANT
+#else
fileversion VERSION, VERVARIANT, VER_COUNT
productversion VERSION, VERVARIANT, VER_COUNT
+#endif
fileflagsmask 0x3F
fileflags
#if defined(DEBUG)
@@ -175,61 +180,3 @@ VS_VERSION_INFO rcdata
VERSION, VERVARIANT, VER_COUNT
};
-/*************************************************************************
-
- Source Code Control System - Update
-
- $Log: not supported by cvs2svn $
- Revision 1.3.142.3 2003/06/18 15:58:49 is
- #110294# shorter license text
-
- Revision 1.3.142.2 2003/06/18 11:27:57 is
- #110294# no more subversion
-
- Revision 1.3.142.1 2003/06/18 09:54:43 is
- #110294# new version info
-
- Revision 1.3 2000/12/07 11:25:47 hjs
- year should be 2000
-
- Revision 1.2 2000/10/30 16:25:56 hjs
- new header; new version/date
-
- Revision 1.1.1.1 2000/09/20 14:43:17 hr
- initial import
-
- Revision 1.2 2000/06/29 17:25:44 hjs
- disable year range
-
- Revision 1.1 2000/06/29 16:00:23 hjs
- generic versioninfo for shared libs
-
- Revision 1.13 2000/05/08 17:52:51 hjs
- release date
-
- Revision 1.12 2000/04/28 11:32:03 hjs
- 5.2 beta6
-
- Revision 1.11 2000/01/17 10:50:29 hro
- #70553# New icons
-
- Revision 1.10 2000/01/12 10:56:45 hro
- #70553# Added system icon to Executable Resource
-
- Revision 1.9 1999/08/05 11:52:34 pb
- fix: #68039# StarDiv -> Sun
-
- Revision 1.8 1999/04/29 19:16:10 HRO
- #65573# New icon resource
-
- Rev 1.7 29 Apr 1999 21:16:10 HRO
- #65573# New icon resource
-
- Rev 1.6 28 Apr 1999 13:59:40 OS
- #56844# Icons fuer HTML und Frameset eingebaut
-
- Rev 1.5 15 Feb 1999 15:32:12 MH
- chg: Reihenfolge
-
-*************************************************************************/
-