summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Smith <brian@briansmith.org>2014-02-15 17:12:41 -0800
committerBrian Smith <brian@briansmith.org>2014-02-15 17:12:41 -0800
commit0b98a2e161aa29dccba68c7f593fef2accabc6d8 (patch)
treef025006931c507decc2a299bed1be2866e4f445a
parentc006fa4bf2c418e7392574afd0701338429a33b5 (diff)
downloadnss-hg-NSS_3_15_5_RTM.tar.gz
Bug 973262: Set version to NSS 3.15.5 release, r=kaieNSS_3_15_5_RTM
-rw-r--r--lib/nss/nss.h4
-rw-r--r--lib/softoken/softkver.h4
-rw-r--r--lib/util/nssutil.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index a79165c8a..6a4d46365 100644
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -33,12 +33,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define NSS_VERSION "3.15.5" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.15.5" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 15
#define NSS_VPATCH 5
#define NSS_VBUILD 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED
diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
index 7a1a9738e..27184c51e 100644
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -25,11 +25,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define SOFTOKEN_VERSION "3.15.5" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.15.5" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 15
#define SOFTOKEN_VPATCH 5
#define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
index a27546174..d4c2704b7 100644
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -19,12 +19,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
-#define NSSUTIL_VERSION "3.15.5 Beta"
+#define NSSUTIL_VERSION "3.15.5"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 15
#define NSSUTIL_VPATCH 5
#define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_TRUE
+#define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS