summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Make_cyg_ming.mak3
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 160fcd9c07..1c1ee8c649 100644
--- 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
index 8520ec5153..bd13c6d445 100644
--- 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,