summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore13
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index f13ca061b3..f247dd198c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,11 +62,12 @@ src/xxd/xxd.dSYM
src/po/vim.pot
# Generated by "make test"
-src/po/*.ck
-src/testdir/mbyte.vim
-src/testdir/mzscheme.vim
-src/testdir/lua.vim
-src/testdir/small.vim
-src/testdir/tiny.vim
+src/po/*.ck
+src/testdir/mbyte.vim
+src/testdir/mzscheme.vim
+src/testdir/lua.vim
+src/testdir/small.vim
+src/testdir/tiny.vim
src/testdir/test*.out
src/testdir/test.log
+src/memfile_test
diff --git a/src/version.c b/src/version.c
index 0921f40d4a..909ce569f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 356,
+/**/
355,
/**/
354,