[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - external/nss

[Andras Timar]

 external/nss/UnpackedTarball_nss.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c04c44aa5f7ca95d0c3cc3d0e45140f70771486a
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 5 01:31:07 2016 -0700

    nss: win vs2013 build fix
    
    Change-Id: Iecdd4adb05b6f6f6217d964e43a3286315302fdc

diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 383fd71..f7409e1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -17,8 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 	external/nss/nss-3.13.5-zlib-werror.patch \
 	external/nss/nss_macosx.patch \
 	external/nss/nss-win32-make.patch.1 \
-	$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \
-		external/nss/nss.vs2015.patch) \
+	$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
 		external/nss/nss-3.13.3-build.patch.3 \
 		external/nss/nss.mingw.patch.3) \