From 4b9b2d1a668d2012ed20e99a8d8187a48670a665 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Thu, 13 Dec 2012 19:11:47 +0000 Subject: [PATCH] Set the NSS version to 3.14.1. Modified Files: Tag: NSS_3_14_1_BRANCH lib/nss/nss.h lib/softoken/softkver.h lib/util/nssutil.h git-svn-id: svn://10.0.0.236/branches/NSS_3_14_1_BRANCH@264558 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/nss/nss.h | 6 +++--- mozilla/security/nss/lib/softoken/softkver.h | 4 ++-- mozilla/security/nss/lib/util/nssutil.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/security/nss/lib/nss/nss.h b/mozilla/security/nss/lib/nss/nss.h index 7144aab427f..c51c4255bc8 100644 --- a/mozilla/security/nss/lib/nss/nss.h +++ b/mozilla/security/nss/lib/nss/nss.h @@ -4,7 +4,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: nss.h,v 1.100 2012-10-19 20:06:07 kaie%kuix.de Exp $ */ +/* $Id: nss.h,v 1.100.2.1 2012-12-13 19:11:46 wtc%google.com Exp $ */ #ifndef __nss_h_ #define __nss_h_ @@ -34,12 +34,12 @@ * The format of the version string should be * ".[.[.]][ ][ ]" */ -#define NSS_VERSION "3.14.1.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.14.1.0" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 14 #define NSS_VPATCH 1 #define NSS_VBUILD 0 -#define NSS_BETA PR_TRUE +#define NSS_BETA PR_FALSE #ifndef RC_INVOKED diff --git a/mozilla/security/nss/lib/softoken/softkver.h b/mozilla/security/nss/lib/softoken/softkver.h index bb0984f827f..a2b006ece5d 100644 --- a/mozilla/security/nss/lib/softoken/softkver.h +++ b/mozilla/security/nss/lib/softoken/softkver.h @@ -25,11 +25,11 @@ * The format of the version string should be * ".[.[.]][ ][ ]" */ -#define SOFTOKEN_VERSION "3.14.1.0" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.14.1.0" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 14 #define SOFTOKEN_VPATCH 1 #define SOFTOKEN_VBUILD 0 -#define SOFTOKEN_BETA PR_TRUE +#define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */ diff --git a/mozilla/security/nss/lib/util/nssutil.h b/mozilla/security/nss/lib/util/nssutil.h index 177beae52dc..0a64d6ffb14 100644 --- a/mozilla/security/nss/lib/util/nssutil.h +++ b/mozilla/security/nss/lib/util/nssutil.h @@ -19,12 +19,12 @@ * The format of the version string should be * ".[.[.]][ ]" */ -#define NSSUTIL_VERSION "3.14.1.0 Beta" +#define NSSUTIL_VERSION "3.14.1.0" #define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMINOR 14 #define NSSUTIL_VPATCH 1 #define NSSUTIL_VBUILD 0 -#define NSSUTIL_BETA PR_TRUE +#define NSSUTIL_BETA PR_FALSE SEC_BEGIN_PROTOS