aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-01-16 00:59:50 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-01-16 00:59:50 +0100
commit3ba5e43d2e3baec1f7e74e2dce7ad340c47c26ad (patch)
tree8075781ad357cb05bf1bf8cf9541181589b32d7d /src/nvim/version.c
parent3fd7be6d3ed1b27b3c6f811d3f210cb9c30deaa4 (diff)
parent2b56cf099a8f383e74496ff48810c8029d3c1ba5 (diff)
downloadrneovim-3ba5e43d2e3baec1f7e74e2dce7ad340c47c26ad.tar.gz
rneovim-3ba5e43d2e3baec1f7e74e2dce7ad340c47c26ad.tar.bz2
rneovim-3ba5e43d2e3baec1f7e74e2dce7ad340c47c26ad.zip
Merge #5918 'vim-patch: 7.4.2006, 7.4.2075, 7.4.2077, 7.4.2117, 7.4.2300, 7.4.2313, 7.4.2314'.
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 04b42ed39f..acaad38ca2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -126,8 +126,8 @@ static int included_patches[] = {
// 2317,
// 2316 NA
// 2315,
- // 2314,
- // 2313,
+ 2314,
+ 2313,
2312,
// 2311 NA
// 2310 NA
@@ -140,7 +140,7 @@ static int included_patches[] = {
// 2303,
// 2302 NA
// 2301 NA
- // 2300,
+ 2300,
// 2299,
// 2298 NA
// 2297 NA
@@ -323,7 +323,7 @@ static int included_patches[] = {
// 2120,
// 2119,
// 2118 NA
- // 2117,
+ 2117,
// 2116 NA
// 2115 NA
// 2114 NA
@@ -363,9 +363,9 @@ static int included_patches[] = {
// 2080,
// 2079 NA
// 2078 NA
- // 2077,
+ 2077,
// 2076,
- // 2075,
+ 2075,
// 2074,
// 2073 NA
// 2072,
@@ -434,7 +434,7 @@ static int included_patches[] = {
2009,
2008,
2007,
- // 2006,
+ 2006,
2005,
// 2004 NA
// 2003 NA