summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-03-19 17:32:51 +0100
committerBram Moolenaar <Bram@vim.org>2014-03-19 17:32:51 +0100
commit2fb9fa19e2263f077163d0da844b637d0a356863 (patch)
tree3bc3ff0fcd36ff2f01ee9c050d30be1a072a3357
parent9c8c8c5d302ad40a3cd89fcd76f718b7e9fe86d5 (diff)
downloadvim-git-2fb9fa19e2263f077163d0da844b637d0a356863.tar.gz
updated for version 7.4.208v7.4.208
Problem: Mercurial picks up some files that are not distributed. Solution: Add patterns to the ignore list. (Cade Forester)
-rw-r--r--.gitignore4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9fbd77957..f13ca061b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,9 @@ bcc.cfg
*.map
*.tds
+# NetBeans
+nbproject/*
+
# Mac OSX
src/xxd/xxd.dSYM
@@ -55,6 +58,7 @@ src/xxd/xxd.dSYM
*.swp
*~
*.pyc
+*.log
src/po/vim.pot
# Generated by "make test"
diff --git a/src/version.c b/src/version.c
index 7ee3b6828..608ef8d7d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 208,
+/**/
207,
/**/
206,