Bug 780009: Update NSS to NSS_3_13_6_RTM. Note that this overwrites

the changes to the three Makefile.in files in dbm/ in the changeset
https://hg.mozilla.org/mozilla-central/rev/162130598df0 for bug 774032.
This commit is contained in:
Wan-Teh Chang 2012-08-10 18:36:28 -07:00
parent 7995a3b3e5
commit cf7b0a861f
9 changed files with 13 additions and 12 deletions

View File

@ -35,7 +35,7 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = @DEPTH@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

View File

@ -35,7 +35,7 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = @DEPTH@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

View File

@ -35,7 +35,7 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = @DEPTH@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

View File

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

View File

@ -1 +1 @@
NSS_3_13_6_BETA1
NSS_3_13_6_RTM

View File

@ -1 +1 @@
NSS_3_13_6_BETA1
NSS_3_13_6_RTM

View File

@ -36,7 +36,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: nss.h,v 1.92.2.5 2012/06/01 19:40:00 kaie%kuix.de Exp $ */
/* $Id: nss.h,v 1.92.2.6 2012/08/11 01:10:37 wtc%google.com Exp $ */
#ifndef __nss_h_
#define __nss_h_
@ -66,12 +66,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define NSS_VERSION "3.13.6.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
#define NSS_VERSION "3.13.6.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 13
#define NSS_VPATCH 6
#define NSS_VBUILD 0
#define NSS_BETA PR_TRUE
#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED

View File

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

View File

@ -51,12 +51,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
#define NSSUTIL_VERSION "3.13.6.0 Beta"
#define NSSUTIL_VERSION "3.13.6.0"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 13
#define NSSUTIL_VPATCH 6
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE
#define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS