aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-12-23 14:13:53 -0500
committerJustin M. Keyes <justinkz@gmail.com>2014-12-23 14:13:53 -0500
commit79fd93768ace47cdacd3f4b7afb3feaa57353c04 (patch)
tree9fbdc7cd4350026a19f98696040760b2bd17fb60 /src/nvim/version.c
parent68f6fcffbff3279db3bbf1041de5ae246a6dd07d (diff)
parentc824e7b2d2c9ef7fc97049c094e00f26adb43550 (diff)
downloadrneovim-79fd93768ace47cdacd3f4b7afb3feaa57353c04.tar.gz
rneovim-79fd93768ace47cdacd3f4b7afb3feaa57353c04.tar.bz2
rneovim-79fd93768ace47cdacd3f4b7afb3feaa57353c04.zip
Merge pull request #1720 from fwalch/vim-7.4.311
vim-patch:7.4.311
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index cd11dfe1d0..ae9151c972 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -426,7 +426,7 @@ static int included_patches[] = {
314,
313,
312,
- //311,
+ 311,
310,
309,
308,