# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455573605 -3600
# Node ID 1e853c5273d0c524af6088dc0c15430f7a44b32c
# Parent  b158efd26f38830c6eaf3654a3eb2244c265fe0e
commit https://github.com/vim/vim/commit/97eba78f69ba68ce8e1fc72bbe762fc321e0a4b1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 15 22:45:12 2016 +0100

    patch 7.4.1326
    Problem:    Build rules are bit too complicated.
    Solution:   Remove -lwsock32 from Netbeans, it's already added for the channel
                feature that it depends on. (Tony Mechelynck)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -684,17 +684,14 @@ ifneq (yes, $(GUI))
 NETBEANS=no
 else
 OBJ += $(OUTDIR)/netbeans.o
-LIB += -lwsock32
 endif
 endif
 endif
 
 ifeq ($(CHANNEL),yes)
 OBJ += $(OUTDIR)/channel.o
-ifneq ($(NETBEANS),yes)
 LIB += -lwsock32
 endif
-endif
 
 ifeq ($(DIRECTX),yes)
 # Only allow DIRECTX for a GUI build.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1326,
+/**/
     1325,
 /**/
     1324,