Merge r9353 (missing bit of 'pre-release' version spport).

[originally from svn r9354]
[r9353 == 7d4789dccbc5431a0a7a18d10ff7ceece87f6f7a]

diff --git a/windows/version.rc2 b/windows/version.rc2
index aaf08ab4d176a783e536ea71b63ada76a435dd0b..a7ab5fc42e6b972574b153f72df43b18c62e8959 100644 (file)
--- a/windows/version.rc2
+++ b/windows/version.rc2
@@ -61,6 +61,11 @@
 #define VERSION_TEXT "Release " STR(RELEASE)
 #define BINARY_VERSION BASE_VERSION,0,0
 
+#elif defined PRERELEASE
+
+#define VERSION_TEXT "Pre-release " STR(PRERELEASE) ":r" STR(SVN_REV);
+#define BINARY_VERSION BASE_VERSION,SVN_REV,0
+
 #elif defined SVN_REV
 
 #define VERSION_TEXT "Custom build r" STR(SVN_REV)