aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-12 01:03:32 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-12 01:03:32 -0400
commit47fefba529be9b64db4339f5a365686842cab8d2 (patch)
treef4964b98b0f412a8d7450c209cb72564f5400592 /src/nvim/version.c
parentbac9db031335f124628895f1247b07137314035a (diff)
parentdd9dc7ae872758bc41b3016487592725daf8fc9e (diff)
downloadrneovim-47fefba529be9b64db4339f5a365686842cab8d2.tar.gz
rneovim-47fefba529be9b64db4339f5a365686842cab8d2.tar.bz2
rneovim-47fefba529be9b64db4339f5a365686842cab8d2.zip
Merge pull request #4731 from jbradaric/vim-7.4.1054
vim-patch:7.4.1054
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 00f8c28b5e..e4dcac7f76 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -628,7 +628,7 @@ static int included_patches[] = {
// 1057,
// 1056,
1055,
- // 1054,
+ 1054,
// 1053,
// 1052,
// 1051,