diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-09-26 22:16:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 22:16:17 -0400 |
| commit | f610b807b48dbaf96fe05459927a8c926b67f8bb (patch) | |
| tree | 71429c5408ff4e26af9c66adf8cf8956622373cf /src/nvim/version.c | |
| parent | 68bcb32ec43e2fab30dc05439fc77cf28793922c (diff) | |
| parent | 4ce24ff9da0f6551eeca2011dc9d05194bf02e12 (diff) | |
| download | rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.gz rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.bz2 rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.zip | |
Merge pull request #5372 from jamessan/vim-7.4.1604
vim-patch:7.4.1604,7.4.1620,7.4.1629,7.4.1630,7.4.1642,7.4.1697
Closes #5149
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 685a2a843b..b403ccfb80 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -801,7 +801,7 @@ static int included_patches[] = { // 1645, // 1644, 1643, - // 1642, + 1642, 1641, // 1640, // 1639, @@ -813,8 +813,8 @@ static int included_patches[] = { // 1633 NA // 1632 NA // 1631 NA - // 1630, - // 1629, + 1630, + 1629, // 1628 NA // 1627 NA // 1626 NA @@ -823,7 +823,7 @@ static int included_patches[] = { // 1623 NA // 1622 NA // 1621 NA - // 1620, + 1620, // 1619, // 1618 NA // 1617 NA @@ -839,7 +839,7 @@ static int included_patches[] = { // 1607, // 1606, // 1605, - // 1604, + 1604, 1603, // 1602 NA // 1601 NA |