aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-08-15 08:35:55 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-08-15 08:35:55 -0400
commit933602b1882c6596f06125fc621825c357409899 (patch)
treef628ec4bd34a33c7c438c71af47efde491347cc8 /src/nvim/version.c
parent6675a71fe4adb0ea21c842c6bba5e950d05a5f2c (diff)
parentfc93536a901b4037f76a223c03d3650afb371f0b (diff)
downloadrneovim-933602b1882c6596f06125fc621825c357409899.tar.gz
rneovim-933602b1882c6596f06125fc621825c357409899.tar.bz2
rneovim-933602b1882c6596f06125fc621825c357409899.zip
Merge pull request #971 from munshkr/p7.4.314
vim-patch:7.4.314
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 70cfbed50e..0d5479506f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -235,7 +235,7 @@ static int included_patches[] = {
//317,
//316,
315,
- //314,
+ 314,
//313,
//312,
//311,