summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-09 16:03:48 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-09 16:03:48 +0200
commit922a443cfdb1a37ef8bdeadf84f8b821ec4b37bd (patch)
tree3b9148e5e4339bfaf48e695bd5a0c3e93cb9906f
parentff330ff2c4500dc5535631418d601194654e4536 (diff)
downloadvim-git-922a443cfdb1a37ef8bdeadf84f8b821ec4b37bd.tar.gz
patch 7.4.2352v7.4.2352
Problem: Netbeans test fails in shadow directory. Solution: Also copy README.txt to the shadow directory.
-rw-r--r--src/Makefile1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 79d7a9c4a..2c0feebe2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2714,6 +2714,7 @@ shadow: runtime pixmaps
mkdir $(SHADOWDIR)/testdir
cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \
../../testdir/Make_all.mak \
+ ../../testdir/README.txt \
../../testdir/*.in \
../../testdir/*.vim \
../../testdir/*.py \
diff --git a/src/version.c b/src/version.c
index 2409c128c..241ae1fcb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2352,
+/**/
2351,
/**/
2350,