diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-25 03:56:33 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-25 03:56:33 -0400 |
commit | 588bc1d9586bc65b63519bc9d292fa4ab59b2dba (patch) | |
tree | e1cb76952f7dc0008ba9f2fc11d13da80d9a94e2 /src/nvim/version.c | |
parent | 121e76db6f2dd2a088ba0fabd17fd80425347d50 (diff) | |
parent | 1addc45e78155a73f52a00762cb77abbd3f8d993 (diff) | |
download | rneovim-588bc1d9586bc65b63519bc9d292fa4ab59b2dba.tar.gz rneovim-588bc1d9586bc65b63519bc9d292fa4ab59b2dba.tar.bz2 rneovim-588bc1d9586bc65b63519bc9d292fa4ab59b2dba.zip |
Merge #4303 'vim-patch:7.4.{951,1143,1144}'.
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r-- | src/nvim/version.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 82a276bb1b..ddc1b5a9a8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -533,8 +533,8 @@ static int included_patches[] = { // 1147, // 1146 NA // 1145 NA - // 1144 NA - // 1143, + 1144, + 1143, // 1142, 1141, // 1140, @@ -726,7 +726,7 @@ static int included_patches[] = { // 954 NA 953, 952, - // 951, + 951, 950, 949, // 948 NA |