diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-02-10 07:22:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 07:22:46 -0500 |
| commit | 7ed1422521eeebdd57bc79a55f4385767976a9f2 (patch) | |
| tree | 5e9c95b603ad62946380e601412a6c9a461c1f55 /src/nvim/version.c | |
| parent | 13ce5fd108123c3ad0ec44f7e0e41b63b2a9974f (diff) | |
| parent | 0b81addd0a7210485ef37a49355effc45b47954e (diff) | |
| download | rneovim-7ed1422521eeebdd57bc79a55f4385767976a9f2.tar.gz rneovim-7ed1422521eeebdd57bc79a55f4385767976a9f2.tar.bz2 rneovim-7ed1422521eeebdd57bc79a55f4385767976a9f2.zip | |
Merge pull request #5904 from lonerover/vim-7.4.2148
vim-patch:7.4.2148,7.4.2159,7.4.2175,7.4.2295
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 73b5c96be0..6188bec91f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -145,7 +145,7 @@ static int included_patches[] = { // 2298 NA // 2297 NA // 2296, - // 2295, + 2295, 2294, // 2293, // 2292, @@ -265,7 +265,7 @@ static int included_patches[] = { // 2178, // 2177, // 2176 NA - // 2175, + 2175, 2174, // 2173, // 2172, @@ -281,7 +281,7 @@ static int included_patches[] = { 2162, // 2161, 2160, - // 2159, + 2159, 2158, // 2157 NA // 2156 NA @@ -292,7 +292,7 @@ static int included_patches[] = { // 2151, // 2150 NA 2149, - // 2148, + 2148, 2147, 2146, // 2145 NA |