diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-21 00:05:37 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-21 00:05:37 -0400 |
| commit | 8e20ba9fbd691955fa20bdba3dd5ff66d16f923c (patch) | |
| tree | c2cbd4dcbff0040d77ba1c1a6577f6947fccd9e9 /src/nvim/version.c | |
| parent | 9d3449852bd35c9283948186d0259c1bf73b8579 (diff) | |
| parent | 853440053c3495958644cb6deabde733ede5dd56 (diff) | |
| download | rneovim-8e20ba9fbd691955fa20bdba3dd5ff66d16f923c.tar.gz rneovim-8e20ba9fbd691955fa20bdba3dd5ff66d16f923c.tar.bz2 rneovim-8e20ba9fbd691955fa20bdba3dd5ff66d16f923c.zip | |
Merge pull request #4737 from jamessan/vim-7.4.1017
https://github.com/neovim/neovim/pull/4789C] vim-patch:7.4.1017,7.4.1018,7.4.1034
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 82a15f9833..fce2896ddf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -650,7 +650,7 @@ static int included_patches[] = { 1037, 1036, 1035, - // 1034, + 1034, // 1033 NA 1032, // 1031 NA, @@ -666,8 +666,8 @@ static int included_patches[] = { // 1021 NA // 1020 NA // 1019 NA - // 1018, - // 1017, + 1018, + 1017, // 1016 NA 1015, // 1014 NA |