Index: nss/mozilla/security/nss/lib/nss/nss.h |
=================================================================== |
--- nss/mozilla/security/nss/lib/nss/nss.h (revision 55475) |
+++ nss/mozilla/security/nss/lib/nss/nss.h (working copy) |
@@ -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.81 2010/07/15 22:47:30 christophe.ravel.bugs%sun.com Exp $ */ |
#ifndef __nss_h_ |
#define __nss_h_ |
@@ -66,11 +66,11 @@ |
* The format of the version string should be |
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" |
*/ |
-#define NSS_VERSION "3.12.6.2" _NSS_ECC_STRING _NSS_CUSTOMIZED |
+#define NSS_VERSION "3.12.7.0" _NSS_ECC_STRING _NSS_CUSTOMIZED |
#define NSS_VMAJOR 3 |
#define NSS_VMINOR 12 |
-#define NSS_VPATCH 6 |
-#define NSS_VBUILD 2 |
+#define NSS_VPATCH 7 |
+#define NSS_VBUILD 0 |
#define NSS_BETA PR_FALSE |
#ifndef RC_INVOKED |
@@ -245,7 +245,7 @@ |
* use both NSS and the Java SunPKCS11 provider. |
* |
* Also NOTE: This is not the recommended method for initializing NSS. |
- * The prefered method is NSS_init(). |
+ * The preferred method is NSS_init(). |
*/ |
#define NSS_INIT_READONLY 0x1 |
#define NSS_INIT_NOCERTDB 0x2 |