Set version numbers to 3.21.1, and remove some unnecessary duplicate tags.
authorKai Engert <kaie@kuix.de>
Mon, 09 Nov 2015 16:56:05 +0100
changeset 11708 f7ab75a9fa7e58a39dcbfe2ad0f7a0a48123533c
parent 11707 3ca35ab646600914ef8fca9e70b95b5a28b4f594
child 11709 1f9d09f9034c08282c7ed1a4946fd13d46917fac
push id845
push userkaie@kuix.de
push dateMon, 09 Nov 2015 15:56:12 +0000
Set version numbers to 3.21.1, and remove some unnecessary duplicate tags.
.hgtags
lib/nss/nss.h
lib/softoken/softkver.h
lib/util/nssutil.h
--- a/.hgtags
+++ b/.hgtags
@@ -1553,12 +1553,9 @@ ae72d76f8d2472505b499c498191c3ce441b6a17
 ae72d76f8d2472505b499c498191c3ce441b6a17 NSS_3_19_1_BETA1
 736d9f81295197d3ba63a4ece70f1c377d28e630 NSS_3_19_1_BETA1
 537d7fc8624c289e4f818a4c69847eaedecceccb NSS_3_19_1_RTM
 2b29dfe134a5fd5ba2c4e80074b7cf8fc2d36cfd NSS_3_19_2_BETA1
 97d30005dd7bb02b15bd2b8a27e2426c49d06d69 NSS_3_19_2_RTM
 6e60855257f0f3d34cb51cdd2aba1800b7834f7f NSS_3_21_Beta1
 dc5a3f75d9d5d0fc6dd5f5b60b5b9be693dbbc78 NSS_3_21_Beta2
 feae8cff7fed6f450b8136af59e7f50e448a5c12 NSS_3_21_Beta3
-24d142d9e229eb96265e5565c437acccb1d2ca15 NSS_3_21_RTM
-24d118f3c692d770f6fb42b8838319e5e8fc6cb3 NSS_3_21_RTM
-24d118f3c692d770f6fb42b8838319e5e8fc6cb3 NSS_3_21_RTM
 507694132f6f0706e7b8e33dac63a560a89f67fc NSS_3_21_RTM
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -28,22 +28,22 @@
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.21" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.21.1" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   21
-#define NSS_VPATCH   0
+#define NSS_VPATCH   1
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
 /*
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -20,16 +20,16 @@
 
 /*
  * Softoken's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.21" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.21.1" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   21
-#define SOFTOKEN_VPATCH   0
+#define SOFTOKEN_VPATCH   1
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -14,22 +14,22 @@
 
 /*
  * NSS utilities's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.21"
+#define NSSUTIL_VERSION  "3.21.1 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   21
-#define NSSUTIL_VPATCH   0
+#define NSSUTIL_VPATCH   1
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.
  */
 extern const char *NSSUTIL_GetVersion(void);