summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-01-20 17:27:22 +0100
committerBram Moolenaar <Bram@vim.org>2015-01-20 17:27:22 +0100
commit6bf7a5933f50db03455104a018f5de1efd82b7fb (patch)
treeed657d7eb88f531b8be9d9edac47ab5b82dc63fc
parente823183254e79af4d384abd99d5bde9b013c4ec5 (diff)
downloadvim-git-7.4.586.tar.gz
updated for version 7.4.586v7.4.586
Problem: Parallel building of the documentation html files is not reliable. Solution: Remove a cyclic dependency. (Reiner Herrmann)
-rw-r--r--runtime/doc/Makefile1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index a6610a937..86ccb74ff 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -229,7 +229,6 @@ HTMLS = \
starting.html \
syntax.html \
tabpage.html \
- tags.html \
tagsrch.html \
term.html \
tips.html \
diff --git a/src/version.c b/src/version.c
index 6fe2b32ce..d43e4c1ca 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 */
/**/
+ 586,
+/**/
585,
/**/
584,