Bug 1460617 - land NSS_3_38_RTM UPGRADE_NSS_RELEASE, r=me

--HG--
extra : rebase_source : 10934c67080bee8e451187f5e2470a2accb34d35
This commit is contained in:
Franziskus Kiefer 2018-06-21 11:38:18 +02:00
parent def07d35e2
commit c6f71b5376
5 changed files with 7 additions and 8 deletions

View File

@ -1 +1 @@
30a4b03cd9d1
NSS_3_38_RTM

View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

View File

@ -22,12 +22,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define NSS_VERSION "3.38" _NSS_CUSTOMIZED " Beta"
#define NSS_VERSION "3.38" _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 38
#define NSS_VPATCH 0
#define NSS_VBUILD 0
#define NSS_BETA PR_TRUE
#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED

View File

@ -17,11 +17,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define SOFTOKEN_VERSION "3.38" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VERSION "3.38" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 38
#define SOFTOKEN_VPATCH 0
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_TRUE
#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */

View File

@ -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.38 Beta"
#define NSSUTIL_VERSION "3.38"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 38
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE
#define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS