aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-09-15 04:35:49 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-09-15 04:35:49 -0400
commit5d35484203cb950a7ba0ed0d9428cb58b37212ff (patch)
tree6a3642a6b8bd409cb9659bb769e024ad9da8f8b6 /src/nvim/version.c
parent53ef7038d84ead3094b828ac0fc540d10e99c1fe (diff)
parentdef28adfdd7a9ee643224e36f3f601f9f7222f46 (diff)
downloadrneovim-5d35484203cb950a7ba0ed0d9428cb58b37212ff.tar.gz
rneovim-5d35484203cb950a7ba0ed0d9428cb58b37212ff.tar.bz2
rneovim-5d35484203cb950a7ba0ed0d9428cb58b37212ff.zip
Merge pull request #1169 from splinterofchaos/arglistid
vim-patch:7.4.312
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 fc0b85fde9..2ca9208469 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -283,7 +283,7 @@ static int included_patches[] = {
315,
314,
//313,
- //312,
+ 312,
//311,
//310,
309,