aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-12 01:08:36 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-12 01:08:36 -0400
commita524200ca706d77b1519759225f73f684280b466 (patch)
tree6027c4420baec58a3f5afb57b43c540505f9c520 /src
parentaa8ccef719cc84469aeb50ce04685163b8e715c1 (diff)
parent1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7 (diff)
downloadrneovim-a524200ca706d77b1519759225f73f684280b466.tar.gz
rneovim-a524200ca706d77b1519759225f73f684280b466.tar.bz2
rneovim-a524200ca706d77b1519759225f73f684280b466.zip
Merge pull request #4729 from jbradaric/vim-7.4.1047
vim-patch 7.4.1047, 7.4.1048, 7.4.1049
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 50e3c324aa..b55d31ea76 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -633,9 +633,9 @@ static int included_patches[] = {
1052,
// 1051,
// 1050,
- // 1049,
- // 1048,
- // 1047,
+ 1049,
+ 1048,
+ 1047,
// 1046,
// 1045 NA
// 1044 NA