# HG changeset patch # User Christian Brabandt # Date 1453728606 -3600 # Node ID b21c2a9dcd7dd72f0acfdcb74eb4591588f9a2c8 # Parent d2c23ce14c65dddffb76be4825c400ab2245d8aa commit https://github.com/vim/vim/commit/f75612fd9912205870bf024e4fb20af62b096c1d Author: Bram Moolenaar Date: Mon Jan 25 14:17:04 2016 +0100 patch 7.4.1175 Problem: Can't build with Mingw and Cygwin. Solution: Remove extra "endif". (Christian J. Robinson) 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 @@ -693,7 +693,6 @@ ifneq ($(NETBEANS),yes) LIB += -lwsock32 endif 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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1175, +/**/ 1174, /**/ 1173,