From b0f4b0fe708577fa85c49c5ab84f74f75b8da7e2 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 1 Sep 2005 01:15:20 +0000 Subject: [PATCH] STABLE14-windows-version-20050831 1.4.0002 (take two) --- src/config/NTMakefile.amd64_w2k | 4 ++-- src/config/NTMakefile.i386_nt40 | 4 ++-- src/config/NTMakefile.i386_w2k | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 4beb07629..9185ca681 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -79,8 +79,8 @@ LIB = $(AFSDEV_LIB) #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 -AFSPRODUCT_VER_MINOR=5 -AFSPRODUCT_VER_PATCH=0000 +AFSPRODUCT_VER_MINOR=4 +AFSPRODUCT_VER_PATCH=0002 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 3e3ca604a..5c54ac8d9 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -79,8 +79,8 @@ LIB = $(AFSDEV_LIB) #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 -AFSPRODUCT_VER_MINOR=5 -AFSPRODUCT_VER_PATCH=0000 +AFSPRODUCT_VER_MINOR=4 +AFSPRODUCT_VER_PATCH=0002 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index 3c2bdd4f9..2972f8301 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -78,9 +78,9 @@ INCLUDE = $(AFSDEV_INCLUDE) LIB = $(AFSDEV_LIB) #define used in WinNT/2000 installation and program version display -AFSPRODUCT_VER_MAJOR=1 -AFSPRODUCT_VER_MINOR=5 -AFSPRODUCT_VER_PATCH=0000 +<<<<<<< NTMakefile.i386_w2k +AFSPRODUCT_VER_MINOR=4 +AFSPRODUCT_VER_PATCH=0002 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID -- 2.39.5