Commit 6f30f56e authored by Kai Engert's avatar Kai Engert
Browse files

Bug 741135, update Mozilla to NSS 3.13.4. Landing final version numbers, no code change. r=wtc

parent 55106937

security/nss/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSS_3_13_4_BETA2
 
NSS_3_13_4_RTM

security/nss/TAG-INFO-CKBI

+1 −1
Original line number Diff line number Diff line 
NSS_3_13_4_BETA2
 
NSS_3_13_4_RTM

security/nss/lib/nss/nss.h

+3 −3
Original line number Diff line number Diff line
@@ -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 2012/02/22 10:00:08 kaie%kuix.de Exp $ */

/* $Id: nss.h,v 1.92.2.1 2012/04/06 15:20:43 kaie%kuix.de 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.4.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"

#define NSS_VERSION  "3.13.4.0" _NSS_ECC_STRING _NSS_CUSTOMIZED

#define NSS_VMAJOR   3

#define NSS_VMINOR   13

#define NSS_VPATCH   4

#define NSS_VBUILD   0

#define NSS_BETA     PR_TRUE

#define NSS_BETA     PR_FALSE



#ifndef RC_INVOKED

security/nss/lib/softoken/softkver.h

+2 −2
Original line number Diff line number Diff line
@@ -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.4.0" SOFTOKEN_ECC_STRING " Beta"

#define SOFTOKEN_VERSION  "3.13.4.0" SOFTOKEN_ECC_STRING

#define SOFTOKEN_VMAJOR   3

#define SOFTOKEN_VMINOR   13

#define SOFTOKEN_VPATCH   4

#define SOFTOKEN_VBUILD   0

#define SOFTOKEN_BETA     PR_TRUE

#define SOFTOKEN_BETA     PR_FALSE



#endif /* _SOFTKVER_H_ */

security/nss/lib/util/nssutil.h

+2 −2
Original line number Diff line number Diff line
@@ -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.4.0 Beta"

#define NSSUTIL_VERSION  "3.13.4.0"

#define NSSUTIL_VMAJOR   3

#define NSSUTIL_VMINOR   13

#define NSSUTIL_VPATCH   4

#define NSSUTIL_VBUILD   0

#define NSSUTIL_BETA     PR_TRUE

#define NSSUTIL_BETA     PR_FALSE



SEC_BEGIN_PROTOS