summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorchristophe.ravel.bugs%sun.com <devnull@localhost>2008-04-17 20:22:45 +0000
committerchristophe.ravel.bugs%sun.com <devnull@localhost>2008-04-17 20:22:45 +0000
commitad4f15ab109defc722144054af6c1c755f26897d (patch)
tree9bad4105c95d531b97cd12c17a9b396d7d10a993 /security
parent40620ec9869c6b41b0bc3bb95b1f30bfe37a77ee (diff)
downloadnss-hg-ad4f15ab109defc722144054af6c1c755f26897d.tar.gz
Set version to NSS 3.12.1 Beta on NSS trunk.
Note: NSS 3.12.0 RTM will be delivered from NSS_3_12_0_BRANCH.
Diffstat (limited to 'security')
-rw-r--r--security/nss/lib/nss/nss.h6
-rw-r--r--security/nss/lib/softoken/softkver.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 67f081804..a1c677229 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -70,11 +70,11 @@ SEC_BEGIN_PROTOS
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
*/
-#define NSS_VERSION "3.12.0.1" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION "3.12.1.0" _NSS_ECC_STRING " Beta" _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 12
-#define NSS_VPATCH 0
-#define NSS_BETA PR_FALSE
+#define NSS_VPATCH 1
+#define NSS_BETA PR_TRUE
/*
* Return a boolean that indicates whether the underlying library
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 58055a07a..76af410e8 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,10 +57,10 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
*/
-#define SOFTOKEN_VERSION "3.12.0.0" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.12.1.0" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 12
-#define SOFTOKEN_VPATCH 0
-#define SOFTOKEN_BETA PR_FALSE
+#define SOFTOKEN_VPATCH 1
+#define SOFTOKEN_BETA PR_TRUE
#endif /* _SOFTKVER_H_ */