STABLE14-windows-version-20050831

1.4.0002 (take two)

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 4beb07629fca2f30a2142ed0413fe5ea785a3e8b..9185ca6813bc56305ffa124411fb7fdcd0c745d5 100644 (file)
--- 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 3e3ca604af36b5d139af5b101ecd4dd1c0469d81..5c54ac8d9829a663c0339d38cbfe90f6425f5152 100644 (file)
--- 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 3c2bdd4f96b59926cf5700f50c862d9c80dcd113..2972f8301f72ca48c0105fe3281308d0a44bcb42 100644 (file)
--- 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