diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:16:59 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-24 09:16:59 +0800 |
| commit | 90fc9039ddcadc61d4236bdd2d638d690081e04d (patch) | |
| tree | ecf08d95a7c9459fa5a79202d85e6666c3f5ee88 /src/nvim/version.c | |
| parent | 6258e33b114dc4386e608a5cf3a48742757441f7 (diff) | |
| parent | 4bb0e95abbf0a61d383d5261019a2667706c9d39 (diff) | |
| download | rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.gz rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.tar.bz2 rneovim-90fc9039ddcadc61d4236bdd2d638d690081e04d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 6f38776a60..d4f9c0232f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -625,10 +625,10 @@ static const int included_patches[] = { // 330, // 329, // 328, - // 327, + 327, 326, 325, - // 324, + 324, // 323, 322, // 321, @@ -647,10 +647,10 @@ static const int included_patches[] = { 308, 307, // 306, - // 305, + 305, // 304, // 303, - // 302, + // 302, NA // 301, 300, // 299, @@ -658,7 +658,7 @@ static const int included_patches[] = { 297, // 296, // 295, - // 294, + 294, // 293, // 292, 291, |