diff --git a/mozilla/security/nss/lib/nss/nss.h b/mozilla/security/nss/lib/nss/nss.h index 22a59ecaef1..f6153fe5bf2 100644 --- a/mozilla/security/nss/lib/nss/nss.h +++ b/mozilla/security/nss/lib/nss/nss.h @@ -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.78 2010-03-02 02:53:04 christophe.ravel.bugs%sun.com Exp $ */ +/* $Id: nss.h,v 1.79 2010-03-26 22:31:18 christophe.ravel.bugs%sun.com Exp $ */ #ifndef __nss_h_ #define __nss_h_ @@ -66,12 +66,12 @@ * The format of the version string should be * ".[.[.]][ ][ ]" */ -#define NSS_VERSION "3.12.6.2" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.12.7.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" #define NSS_VMAJOR 3 #define NSS_VMINOR 12 -#define NSS_VPATCH 6 -#define NSS_VBUILD 2 -#define NSS_BETA PR_FALSE +#define NSS_VPATCH 7 +#define NSS_VBUILD 0 +#define NSS_BETA PR_TRUE #ifndef RC_INVOKED diff --git a/mozilla/security/nss/lib/util/nssutil.h b/mozilla/security/nss/lib/util/nssutil.h index 9cfb63c1dc1..cb887a4c4d3 100644 --- a/mozilla/security/nss/lib/util/nssutil.h +++ b/mozilla/security/nss/lib/util/nssutil.h @@ -51,11 +51,11 @@ * The format of the version string should be * ".[.[.]][ ]" */ -#define NSSUTIL_VERSION "3.12.6.2" +#define NSSUTIL_VERSION "3.12.7.0 Beta" #define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMINOR 12 -#define NSSUTIL_VPATCH 6 -#define NSSUTIL_VBUILD 2 -#define NSSUTIL_BETA PR_FALSE +#define NSSUTIL_VPATCH 7 +#define NSSUTIL_VBUILD 0 +#define NSSUTIL_BETA PR_TRUE #endif /* __nssutil_h_ */ diff --git a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn index e20badc4069..8f94f00c0a4 100644 --- a/mozilla/security/nss/manifest.mn +++ b/mozilla/security/nss/manifest.mn @@ -37,7 +37,7 @@ CORE_DEPTH = .. DEPTH = .. -IMPORTS = nspr20/v4.7 \ +IMPORTS = nspr20/v4.8 \ $(NULL) RELEASE = nss