summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-26 13:14:02 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-26 13:14:02 +0200
commita8c99fb78e9d747c127e8878518d5a43837b022b (patch)
treec14ad956e80e37b9540d284a369bf944fa4ba014
parent80f95425cf98725004b5e8e723ca63f05d3723fa (diff)
patch 8.1.1398: duplicate line in MSVC build filev8.1.1398
Problem: Duplicate line in MSVC build file. Solution: Remove the line. (Ken Takata, closes #4436)
-rw-r--r--src/Make_mvc.mak1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c1cd0a460c..c6f9b25a00 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -744,7 +744,6 @@ OBJ = \
$(OUTDIR)\pathdef.obj \
$(OUTDIR)\popupmnu.obj \
$(OUTDIR)\popupwin.obj \
- $(OUTDIR)\popupwin.obj \
$(OUTDIR)\quickfix.obj \
$(OUTDIR)\regexp.obj \
$(OUTDIR)\screen.obj \
diff --git a/src/version.c b/src/version.c
index 0e7f14d6cc..8cfb965c3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1398,
+/**/
1397,
/**/
1396,