aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-01-01 15:12:33 -0500
committerGitHub <noreply@github.com>2017-01-01 15:12:33 -0500
commitc5f4b92ff93a40ec4e77b78d0576903e7a60eefd (patch)
treed4bdbc55eec66541aa95a03adff0403d6ab71685 /src/nvim/version.c
parent57ce8b56488a781088cb503f0da723f59e2f9554 (diff)
parent46235a30edc4ee09fdbd4f489865982bafde247d (diff)
downloadrneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.tar.gz
rneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.tar.bz2
rneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.zip
Merge pull request #5613 from jamessan/vim-7.4.2183
vim-patch:7.4.2183,7.4.2194,7.4.2201,7.4.2204,0952131,7.4.2215,7.4.2225,7.4.2226,7.4.2272,7.4.2273,7.4.2277,7.4.2294
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9f3395680b..9f2b7a26c3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -146,7 +146,7 @@ static int included_patches[] = {
// 2297 NA
// 2296,
// 2295,
- // 2294,
+ 2294,
// 2293,
// 2292,
// 2291,
@@ -163,12 +163,12 @@ static int included_patches[] = {
// 2280,
// 2279,
// 2278 NA
- // 2277,
+ 2277,
// 2276,
// 2275,
2274,
- // 2273,
- // 2272,
+ 2273,
+ 2272,
// 2271 NA
// 2270 NA
// 2269,
@@ -214,8 +214,8 @@ static int included_patches[] = {
// 2229,
// 2228,
2227,
- // 2226,
- // 2225,
+ 2226,
+ 2225,
// 2224,
// 2223,
// 2222,
@@ -225,7 +225,7 @@ static int included_patches[] = {
// 2218 NA
2217,
// 2216 NA
- // 2215,
+ 2215,
// 2214 NA
2213,
2212,
@@ -236,17 +236,17 @@ static int included_patches[] = {
// 2207 NA
// 2206 NA
2205,
- // 2204,
+ 2204,
// 2203 NA
// 2202 NA
- // 2201,
+ 2201,
// 2200,
// 2199 NA
// 2198,
// 2197,
// 2196,
// 2195 NA
- // 2194,
+ 2194,
// 2193 NA
// 2192 NA
// 2191 NA
@@ -257,7 +257,7 @@ static int included_patches[] = {
// 2186 NA
// 2185,
// 2184,
- // 2183,
+ 2183,
// 2182 NA
// 2181,
// 2180,