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)

Author: brammool

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.

src/version.c

@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1326,
 /**/
     1325,
 /**/