diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-10-08 09:35:23 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-10-08 09:35:23 +0800 |
| commit | 76606b6bc587fddcf990cf40a39521750734a80d (patch) | |
| tree | 2810779733954dccec0bae739768b8d4e4186d4c /src/nvim/version.c | |
| parent | f2b9ccec106b6c4619cc762ea77546810f1cbfd4 (diff) | |
| parent | 032b088c848585e60e8dc1a210f240bad6bb3387 (diff) | |
| download | rneovim-76606b6bc587fddcf990cf40a39521750734a80d.tar.gz rneovim-76606b6bc587fddcf990cf40a39521750734a80d.tar.bz2 rneovim-76606b6bc587fddcf990cf40a39521750734a80d.zip | |
Merge remote-tracking branch 'upstream/master'
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 b0d4e194fa..8015d7520d 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 |