diff options
author | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2017-11-19 22:05:22 +0300 |
commit | 03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f (patch) | |
tree | a3a05c99fe20de98aafbdea9314aa0d76f71aee9 /src/nvim/version.c | |
parent | 6ea3a08fdbb276fe64dda60c5fb934360327ed39 (diff) | |
parent | de8b1fd1dee5a91b2893fccc53cfd11631ccba38 (diff) | |
download | rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.gz rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.tar.bz2 rneovim-03a129aacf7e4b77ceaccc71251ecb5bf41d2a8f.zip |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r-- | src/nvim/version.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 17f60f309c..e759d1542b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -823,7 +823,7 @@ static const int included_patches[] = { // 286, // 285 NA // 284 NA - // 283, + 283, 282, // 281 NA 280, @@ -858,18 +858,18 @@ static const int included_patches[] = { // 251, 250, // 249 NA - // 248, + // 248 NA 247, // 246 NA - // 245, + 245, // 244, 243, - // 242, + 242, // 241 NA // 240 NA // 239 NA // 238, - // 237, + 237, // 236, 235, // 234, @@ -880,15 +880,15 @@ static const int included_patches[] = { 229, // 228, // 227, - // 226, + 226, // 225, - // 224, + 224, 223, // 222, // 221 NA // 220, 219, - // 218, + 218, // 217 NA // 216, // 215, |