/pidgin/main: db363e8b1fed: Upgrade NSS to 3.15.4

[Daniel Atallah]

Changeset: db363e8b1feddc3501d2bc1133b22184e737b901
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-01-13 02:17 +0000
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/db363e8b1fed

Description:

Upgrade NSS to 3.15.4

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
@@ -18,7 +18,7 @@ version 2.10.8:
 	* Fix Tcl scripts. (#15520)
 	* Fix crash-on-startup when ASLR is always on. (#15521)
 	* Updates to dependencies:
-		* NSS 3.15.3 and NSPR 4.10.2
+		* NSS 3.15.4 and NSPR 4.10.2
 
 	Gadu-Gadu:
 	* Disabled buddy list import/export from/to server (it didn't work
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -17,7 +17,7 @@ GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.3-nspr-4.10.2
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5