aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-09-18 13:49:39 +0200
committerGitHub <noreply@github.com>2016-09-18 13:49:39 +0200
commitc12801986c1d4c219a4a1d6fc30ec15c03d963b6 (patch)
tree0faab0801f82b21d97d04b1850822ed1963ad43b /src/nvim/version.c
parente1079c2a289de18923950338ea08ee80c01cc6cf (diff)
parent89a7a4f02c35e414bc0bd33560738c9cf0abe33e (diff)
downloadrneovim-c12801986c1d4c219a4a1d6fc30ec15c03d963b6.tar.gz
rneovim-c12801986c1d4c219a4a1d6fc30ec15c03d963b6.tar.bz2
rneovim-c12801986c1d4c219a4a1d6fc30ec15c03d963b6.zip
Merge #5254 from KillTheMule/vim-7.4.1952
vim-patch:7.4.{1952, 1990, 2033, 2284}
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index fa949224f3..c2f9ed49e7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -74,6 +74,7 @@ static char *features[] = {
// clang-format off
static int included_patches[] = {
+ 2284,
2219,
// 2200,
// 2199,
@@ -242,7 +243,7 @@ static int included_patches[] = {
// 2036,
// 2035 NA
// 2034 NA
- // 2033,
+ 2033,
// 2032 NA
// 2031,
// 2030 NA
@@ -285,7 +286,7 @@ static int included_patches[] = {
// 1993,
// 1992,
// 1991,
- // 1990,
+ 1990,
// 1989,
// 1988 NA
// 1987 NA
@@ -323,7 +324,7 @@ static int included_patches[] = {
// 1955,
// 1954,
// 1953,
- // 1952,
+ 1952,
// 1951 NA
// 1950,
// 1949,