summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristophe.ravel.bugs%sun.com <devnull@localhost>2008-04-04 20:37:01 +0000
committerchristophe.ravel.bugs%sun.com <devnull@localhost>2008-04-04 20:37:01 +0000
commit8f1714823a79932ce9a50cd7469e9e5958a19966 (patch)
tree6af44957deb82728af74cbc5f12d5b4edd02d774
parentf912314ef2c69da5c319c06b9036b5fbd778962c (diff)
downloadnss-hg-8f1714823a79932ce9a50cd7469e9e5958a19966.tar.gz
Prepare NSS 3.12 RC1.
-rw-r--r--security/nss/lib/nss/nss.h4
-rw-r--r--security/nss/lib/softoken/softkver.h4
-rw-r--r--security/nss/manifest.mn2
3 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 83868264f..c1cee7638 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" _NSS_ECC_STRING " Beta" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.12.0.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 12
#define NSS_VPATCH 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
/*
* 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 3bfc6c34b..58055a07a 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" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.12.0.0" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 12
#define SOFTOKEN_VPATCH 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */
diff --git a/security/nss/manifest.mn b/security/nss/manifest.mn
index 918b66951..e20badc40 100644
--- a/security/nss/manifest.mn
+++ b/security/nss/manifest.mn
@@ -37,7 +37,7 @@
CORE_DEPTH = ..
DEPTH = ..
-IMPORTS = nspr20/v4.6.3 \
+IMPORTS = nspr20/v4.7 \
$(NULL)
RELEASE = nss