diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-15 08:31:13 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-15 08:31:13 -0400 |
commit | 6675a71fe4adb0ea21c842c6bba5e950d05a5f2c (patch) | |
tree | c146ed8ec2af0a06cc608b064c1e557ff432a5ea /src/nvim/version.c | |
parent | 6d4530979745aae216909f066c930893bbfbae81 (diff) | |
parent | 01d6898638851d01f6cb5812f1d6f64cda0ddc83 (diff) | |
download | rneovim-6675a71fe4adb0ea21c842c6bba5e950d05a5f2c.tar.gz rneovim-6675a71fe4adb0ea21c842c6bba5e950d05a5f2c.tar.bz2 rneovim-6675a71fe4adb0ea21c842c6bba5e950d05a5f2c.zip |
Merge pull request #972 from munshkr/p7.4.293
vim-patch:7.4.293, vim-patch:7.4.294
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r-- | src/nvim/version.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 5416bc7473..70cfbed50e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -255,8 +255,8 @@ static int included_patches[] = { //297, //296, 295, - //294, - //293, + 294, + 293, 292, 291, 290, |