summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-07-21 20:22:12 +0200
committerBram Moolenaar <Bram@vim.org>2015-07-21 20:22:12 +0200
commitd4a95c3bc5a70f43db0abd020a15d8a1a65db961 (patch)
treeade6daf21197879beb575a9c924ef64504b810ed
parentf91328100db34996ed7e7a800bed0a30ff0890dd (diff)
downloadvim-git-d4a95c3bc5a70f43db0abd020a15d8a1a65db961.tar.gz
patch 7.4.794v7.4.794
Problem: Visual Studio 2015 is not recognized. Solution: Add the version numbers to the makefile. (Taro Muraoka)
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 722127deb..7cb724539 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -446,7 +446,7 @@ MSVCVER = 11.0
!if "$(_NMAKE_VER)" == "12.00.21005.1"
MSVCVER = 12.0
!endif
-!if ("$(_NMAKE_VER)" == "14.00.22609.0") || ("$(_NMAKE_VER)" == "14.00.22816.0")
+!if ("$(_NMAKE_VER)" == "14.00.22609.0") || ("$(_NMAKE_VER)" == "14.00.22816.0") || ("$(_NMAKE_VER)" == "14.00.23026.0")
MSVCVER = 14.0
!endif
!endif
diff --git a/src/version.c b/src/version.c
index fa4cabf8e..a29c9fb95 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 */
/**/
+ 794,
+/**/
793,
/**/
792,