diff options
| author | Justin Gassner <justin.gassner@web.de> | 2015-05-15 23:47:04 +0200 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-05-16 16:05:28 -0400 |
| commit | 9b87955b34cca3b2a9708b073e07f3641198e7a0 (patch) | |
| tree | 21d36f2123f18bb92eacc685b43016159ff600ac | |
| parent | 6f72f56492c0948371c746356458c1693efa85a3 (diff) | |
| download | rneovim-9b87955b34cca3b2a9708b073e07f3641198e7a0.tar.gz rneovim-9b87955b34cca3b2a9708b073e07f3641198e7a0.tar.bz2 rneovim-9b87955b34cca3b2a9708b073e07f3641198e7a0.zip | |
vim-patch:7.4.{629,695,696,701} Mark as included #2666
https://github.com/vim/vim/commit/v7-4-629
https://github.com/vim/vim/commit/v7-4-695
https://github.com/vim/vim/commit/v7-4-696
deal with coverity issues which were fixed by #1947
https://github.com/vim/vim/commit/v7-4-701
fixes a compiler warning for an uninitialized variable introduced in 695
| -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 21d8fd0bf1..c8aa4ba0af 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -82,13 +82,13 @@ static int included_patches[] = { //704, //703, 702, - //701, + //701 NA //700, 699, //698, //697, - //696, - //695, + 696, + 695, //694, //693, //692, @@ -154,7 +154,7 @@ static int included_patches[] = { //632 NA //631, 630, - //629, + 629, //628, //627, //626 NA |