diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-08 09:18:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 09:18:51 -0500 |
| commit | 49d29526587b587d08e2883b060c756637e891a2 (patch) | |
| tree | 0865446cf230fb1e10b57509a063453b6a51584f /src/nvim/version.c | |
| parent | adf29cef721d07fa812bca8abf6f1f169b3f877e (diff) | |
| parent | 63c46c11062f5c720644d9bb419f42b0a6d837c8 (diff) | |
| download | rneovim-49d29526587b587d08e2883b060c756637e891a2.tar.gz rneovim-49d29526587b587d08e2883b060c756637e891a2.tar.bz2 rneovim-49d29526587b587d08e2883b060c756637e891a2.zip | |
Merge pull request #5659 from brcolow/vim-7.4.1685
vim-patch:7.4.[1685,2163,2217,2269],8.0.00[33,40]
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 8677296d59..32d28a1b89 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -225,7 +225,7 @@ static int included_patches[] = { // 2220, 2219, // 2218 NA - // 2217, + 2217, // 2216 NA // 2215, // 2214 NA @@ -279,7 +279,7 @@ static int included_patches[] = { // 2166 NA // 2165, // 2164, - // 2163, + 2163, 2162, // 2161, // 2160, @@ -759,7 +759,7 @@ static int included_patches[] = { // 1688 NA // 1687 NA 1686, - // 1685, + 1685, // 1684 NA // 1683 NA 1682, |