aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-04-25 03:20:45 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-04-25 03:20:45 -0400
commit121e76db6f2dd2a088ba0fabd17fd80425347d50 (patch)
tree08cc3e90008b2f24a1bc204985561f49b3b22d7e /src/nvim/version.c
parent5a5ef1c2227f1cb1c599cc8224a48c3e831aca9b (diff)
parent6d2ed7c0eba6ff283fb296b07afa0cefe6ed8635 (diff)
downloadrneovim-121e76db6f2dd2a088ba0fabd17fd80425347d50.tar.gz
rneovim-121e76db6f2dd2a088ba0fabd17fd80425347d50.tar.bz2
rneovim-121e76db6f2dd2a088ba0fabd17fd80425347d50.zip
Merge pull request #4273 from watiko/vim-7.4.957
vim-patch:7.4.{941,942,957}
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ca6b66f220..82a276bb1b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -720,7 +720,7 @@ static int included_patches[] = {
// 960 NA
// 959 NA
958,
- // 957,
+ 957,
// 956 NA
955,
// 954 NA
@@ -735,8 +735,8 @@ static int included_patches[] = {
945,
944,
// 943 NA
- // 942,
- // 941,
+ 942,
+ 941,
// 940 NA
939,
// 938 NA