aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-06-09 21:56:49 -0400
committerGitHub <noreply@github.com>2016-06-09 21:56:49 -0400
commitb3f6b3075188860454e6000c765f8483c5ca782a (patch)
treee0bc267f245eb7e7a069e75d4521344d75eea007 /src/nvim/version.c
parent56e9e81115f9c551c5820cb49284602224e0e84e (diff)
parent1e6fa9338e58a3ed9f014ffea4ed52df78f1258b (diff)
downloadrneovim-b3f6b3075188860454e6000c765f8483c5ca782a.tar.gz
rneovim-b3f6b3075188860454e6000c765f8483c5ca782a.tar.bz2
rneovim-b3f6b3075188860454e6000c765f8483c5ca782a.zip
Merge pull request #4788 from brcolow/vim-7.4.1051
vim-patch:7.4.{1051,1068}
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 917ba8ceb0..6095e543c1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -625,7 +625,7 @@ static int included_patches[] = {
1071,
// 1070 NA
// 1069 NA
- // 1068,
+ 1068,
// 1067 NA
// 1066 NA
1065,
@@ -642,7 +642,7 @@ static int included_patches[] = {
1054,
1053,
1052,
- // 1051,
+ 1051,
1050,
1049,
1048,