diff options
author | KunMing Xie <qqzz014@gmail.com> | 2017-10-08 09:33:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 09:33:20 +0800 |
commit | 4b2592d7b6c295093b07ac2737658767c3e3377b (patch) | |
tree | 7b238e71c98398bb9433f0a48858c3ab3909be39 /src/nvim/version.c | |
parent | f97ca6b3339ca04477296c834a159d40d2201ccd (diff) | |
parent | 032b088c848585e60e8dc1a210f240bad6bb3387 (diff) | |
download | rneovim-4b2592d7b6c295093b07ac2737658767c3e3377b.tar.gz rneovim-4b2592d7b6c295093b07ac2737658767c3e3377b.tar.bz2 rneovim-4b2592d7b6c295093b07ac2737658767c3e3377b.zip |
Merge branch 'master' into vim-8.0.0131
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 1432a92998..e35109a67e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -946,7 +946,7 @@ static const int included_patches[] = { // 160, 159, 158, - // 157, + 157, 156, 155, // 154, @@ -955,13 +955,13 @@ static const int included_patches[] = { // 151, 150, 149, - // 148, + 148, 147, 146, // 145 NA // 144 NA 143, - // 142, + 142, // 141, // 140, // 139 NA |