/pidgin/main: 30f7c83da15d: win32: bump NSS and NSPR versions to...

[Daniel Atallah]

Changeset: 30f7c83da15df64260a717beaf2d96edcf521571
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2016-01-01 13:27 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/30f7c83da15d

Description:

win32: bump NSS and NSPR versions to 3.20.1/4.10.0 (will be included in 2.10.12 binary)

diffstat:

 ChangeLog                  |  2 +-
 libpurple/win32/global.mak |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ version 2.10.12 (12/31/15):
 	* Updates to dependencies:
 		* Cyrus SASL 2.1.26
 		* libxml2 2.9.2
-		* NSS 3.17.3 and NSPR 4.10.7
+		* NSS 3.20.1 and NSPR 4.10.10
 		* Perl 5.20.1
 		* SILC 1.1.12
 	* Remove support for Tcl plugins
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -16,7 +16,7 @@ GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
 GTK_BIN ?= $(GTK_TOP)/bin
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.2_daa1
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.17.3-nspr-4.10.7
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.20.1-nspr-4.10.10
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.20.1.1
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.12
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13