aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-10-31 10:13:41 -0400
committerGitHub <noreply@github.com>2016-10-31 10:13:41 -0400
commit859e9fa65f539020a15794a98bc8eff2f9538ded (patch)
tree36584f5b9667c461dd8d98c5ce3fde25d1cd9f6b /src/nvim/version.c
parented198737fd739dcd4960763028a73e4efd83c452 (diff)
parentf6f77272b3233ea2926e2d7fb2c007e381a85ea1 (diff)
downloadrneovim-859e9fa65f539020a15794a98bc8eff2f9538ded.tar.gz
rneovim-859e9fa65f539020a15794a98bc8eff2f9538ded.tar.bz2
rneovim-859e9fa65f539020a15794a98bc8eff2f9538ded.zip
Merge pull request #5527 from brcolow/vim-7.4.1730
vim-patch:7.4.[1730,1734,1741,1742,1779,1782]
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7ab8c84569..a215001194 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -661,10 +661,10 @@ static int included_patches[] = {
// 1785,
// 1784 NA
// 1783,
- // 1782,
+ 1782,
// 1781,
// 1780,
- // 1779,
+ 1779,
// 1778 NA
// 1777 NA
// 1776 NA
@@ -702,19 +702,19 @@ static int included_patches[] = {
// 1745 NA
// 1744 NA
// 1743 NA
- // 1742,
- // 1741,
+ 1742,
+ 1741,
1740,
// 1739,
// 1738,
// 1737 NA
// 1736 NA
// 1735,
- // 1734,
+ 1734,
// 1733 NA
1732,
// 1731,
- // 1730,
+ 1730,
// 1729 NA
1728,
// 1727,