summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-25 14:17:04 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-25 14:17:04 +0100
commitf75612fd9912205870bf024e4fb20af62b096c1d (patch)
tree01ec9db4d42b85a7609d5f6195f4106fa404c9d0
parent3e53c700a2bcbe7fafb51cd01f3e6428fd803099 (diff)
downloadvim-git-f75612fd9912205870bf024e4fb20af62b096c1d.tar.gz
patch 7.4.1175v7.4.1175
Problem: Can't build with Mingw and Cygwin. Solution: Remove extra "endif". (Christian J. Robinson)
-rw-r--r--src/Make_cyg_ming.mak1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 5c7332e1c..026c966bf 100644
--- 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
index 042454f06..9568029c4 100644
--- 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,