aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-06-08 00:23:48 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-06-08 00:23:48 -0400
commit7e74ba4108240bd20f4ee7116c407def0d9f4458 (patch)
tree843ac76d6cf8235e7ecaf0dfa3b0fcafcad56e7d /src/nvim/version.c
parent00fc216e2be1f3a32fd31fb08a2ecdc66acd0543 (diff)
parent24a329b53aa3be03ed79768cca04d63d6bb93891 (diff)
downloadrneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.tar.gz
rneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.tar.bz2
rneovim-7e74ba4108240bd20f4ee7116c407def0d9f4458.zip
Merge pull request #4804 from brcolow/vim-7.4.1150
vim-patch:7.4.{1150,1151}
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 07ae2cb2d4..3208f701e3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -542,8 +542,8 @@ static int included_patches[] = {
// 1154 NA
// 1153,
// 1152 NA
- // 1151,
- // 1150,
+ 1151,
+ 1150,
1149,
// 1148 NA
// 1147,