diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:19:40 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-03 16:19:40 +0300 |
| commit | 7af8601db4bba355753241c2326b80410b187350 (patch) | |
| tree | af56b809a3a24be5b1d5d0de12ee23dc0bc1f2b8 /src/nvim/version.c | |
| parent | 62993323494d846190590606d37aff1136421671 (diff) | |
| parent | 27a577586eace687c47e7398845178208cae524a (diff) | |
| download | rneovim-7af8601db4bba355753241c2326b80410b187350.tar.gz rneovim-7af8601db4bba355753241c2326b80410b187350.tar.bz2 rneovim-7af8601db4bba355753241c2326b80410b187350.zip | |
Merge branch 'master' into expression-parser
Hoping that could fix the LSAN issue: no idea what it is talking about.
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 9ef35e66f8..1a9c9d73e5 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -950,7 +950,7 @@ static const int included_patches[] = { // 309, 308, 307, - // 306, + 306, 305, // 304, // 303, @@ -958,10 +958,10 @@ static const int included_patches[] = { // 301, 300, // 299, - // 298, + 298, 297, // 296, - // 295, + 295, 294, // 293, 292, @@ -1085,7 +1085,7 @@ static const int included_patches[] = { 174, // 173 NA 172, - // 171, + // 171 NA // 170 NA // 169 NA 168, |