diff options
author | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
---|---|---|
committer | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
commit | 673fc748237345914e0ad584bc4cba997c96a37e (patch) | |
tree | 7f55a3b3dd362fbbc59ff204287a0aae99089e5e /src/nvim/version.c | |
parent | 5d332084e1ca4c29b1ccb90ea44c3b861dac5701 (diff) | |
parent | 5b32bce73c93a64970afe0e92e0a8ba2fed88619 (diff) | |
download | rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.gz rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.bz2 rneovim-673fc748237345914e0ad584bc4cba997c96a37e.zip |
Merge remote-tracking branch 'upstream/master'
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 f4984864f3..f5b45caefc 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -273,8 +273,8 @@ static const int included_patches[] = { // 682, // 681, // 680, - // 679, - // 678, + 679, + 678, // 677, // 676, // 675, @@ -778,7 +778,7 @@ static const int included_patches[] = { 177, 176, // 175, - // 174, + 174, // 173 NA 172, // 171, @@ -908,7 +908,7 @@ static const int included_patches[] = { 47, 46, // 45 NA - // 44, + 44, 43, 42, 41, |