diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-16 16:49:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 16:49:14 +0200 |
| commit | 77a4f8f235901778d889aed7c708e1608eac25f6 (patch) | |
| tree | bd85c8fc04d7cb4124cb216da90e7960a27b5b0f /src/nvim/version.c | |
| parent | d4c7f74ed135e1c1069eae265095809f21d9ebd8 (diff) | |
| parent | ec0fabd4d5129c7293c8b8fcf0d0946ae5bd5fd4 (diff) | |
| download | rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.tar.gz rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.tar.bz2 rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.zip | |
Merge #6219 from jbradaric/vim-7.4.2170
vim-patch:7.4.{2170,2180,2240,2241,2242}
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 0ee0419849..9a5d7ce169 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -82,7 +82,7 @@ static const int included_patches[] = { 2362, // 2361 NA // 2360, - // 2359 NA + 2359, // 2358 NA 2357, // 2356, @@ -109,7 +109,7 @@ static const int included_patches[] = { 2335, 2334, 2333, - // 2332 NA + 2332, 2331, 2330, 2329, @@ -137,7 +137,7 @@ static const int included_patches[] = { 2307, 2306, 2305, - // 2304 NA + 2304, 2303, // 2302 NA // 2301 NA @@ -160,7 +160,7 @@ static const int included_patches[] = { 2284, 2283, // 2282 NA - // 2281 NA + 2281, 2280, 2279, // 2278 NA @@ -199,9 +199,9 @@ static const int included_patches[] = { // 2245, // 2244, // 2243 NA - // 2242, - // 2241, - // 2240, + 2242, + 2241, + 2240, // 2239, // 2238 NA 2237, @@ -260,8 +260,8 @@ static const int included_patches[] = { 2184, 2183, // 2182 NA - // 2181, - // 2180, + // 2181 NA + 2180, // 2179, 2178, 2177, @@ -270,8 +270,8 @@ static const int included_patches[] = { 2174, // 2173, 2172, - // 2171, - // 2170, + // 2171 NA + 2170, 2169, // 2168 NA // 2167 NA |