aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-12-08 10:43:17 -0500
committerJames McCoy <jamessan@jamessan.com>2016-12-08 10:43:17 -0500
commitddfac951eab5d392eb0bc36748bc3d586203cc11 (patch)
tree7cd12cad17274d59bc5696b9c8eb6065c2eeaf75 /src/nvim/version.c
parent49d29526587b587d08e2883b060c756637e891a2 (diff)
parent652f15aaa51652b83b7ef3d2984c236678424bdf (diff)
downloadrneovim-ddfac951eab5d392eb0bc36748bc3d586203cc11.tar.gz
rneovim-ddfac951eab5d392eb0bc36748bc3d586203cc11.tar.bz2
rneovim-ddfac951eab5d392eb0bc36748bc3d586203cc11.zip
Merge pull request #5705 from brcolow/vim-7.4.1835
vim-patch:7.4.[1835,1956]
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 32d28a1b89..821922fd38 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -486,7 +486,7 @@ static int included_patches[] = {
// 1959 NA
// 1958 NA
// 1957 NA
- // 1956,
+ 1956,
// 1955,
// 1954,
// 1953,
@@ -607,7 +607,7 @@ static int included_patches[] = {
// 1838,
// 1837,
// 1836,
- // 1835,
+ 1835,
// 1834,
1833,
1832,