summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2efc13f76..813db93ca 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2015 Oct 13
+" Last Change: 2015 Dec 03
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
diff --git a/src/version.c b/src/version.c
index 1e6322284..7f99e81de 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 */
/**/
+ 956,
+/**/
955,
/**/
954,