diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 026c966bfe..28d31d6120 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -679,8 +679,10 @@ ifneq ($(CHANNEL),yes) # Cannot use Netbeans without CHANNEL NETBEANS=no else -# Only allow NETBEANS for a GUI build. -ifeq (yes, $(GUI)) +ifneq (yes, $(GUI)) +# Cannot use Netbeans without GUI. +NETBEANS=no +else OBJ += $(OUTDIR)/netbeans.o LIB += -lwsock32 endif diff --git a/src/version.c b/src/version.c index c047848fa8..a380ed3410 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1320, /**/ 1319, /**/