summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-20 11:28:18 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-20 11:28:18 +0200
commitcf2d77987ca2af092dad5d4cbca9eda621fe5567 (patch)
treee3002d051272bc108e37c4b8406511893f814bf1
parentddf8d1c746ee081d15c9d7e0515f6ac43adbf363 (diff)
patch 7.4.1946v7.4.1946
Problem: File list does not include new XPM libraries. Solution: Add the file list entries.
-rw-r--r--Filelist2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Filelist b/Filelist
index b2b88ab0b3..d7fbecb0e4 100644
--- a/Filelist
+++ b/Filelist
@@ -379,8 +379,10 @@ SRC_DOS_BIN = \
src/xpm/include/*.h \
src/xpm/x64/lib/libXpm.a \
src/xpm/x64/lib/libXpm.lib \
+ src/xpm/x64/lib-vc14/libXpm.lib \
src/xpm/x86/lib/libXpm.a \
src/xpm/x86/lib/libXpm.lib \
+ src/xpm/x86/lib-vc14/libXpm.lib \
nsis/icons/*.bmp \
nsis/icons/*.ico \
diff --git a/src/version.c b/src/version.c
index bef210aaca..bda068bca8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1946,
+/**/
1945,
/**/
1944,