aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-02-09 01:58:54 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-02-09 01:58:54 -0500
commitb9701c2a2b7b4633e894ad62955e0a0039dc0f95 (patch)
tree970a236df8b1ab30b5866487ff00f4e49c7c71bf /src/nvim/version.c
parent17ae27190d4589b2a35f44bc6c8b552f4bf06d4e (diff)
parent52692d3cd3e682a4116d3cec1fcf05880f0c77a1 (diff)
downloadrneovim-b9701c2a2b7b4633e894ad62955e0a0039dc0f95.tar.gz
rneovim-b9701c2a2b7b4633e894ad62955e0a0039dc0f95.tar.bz2
rneovim-b9701c2a2b7b4633e894ad62955e0a0039dc0f95.zip
Merge #4152 'vim-patch:7.4.{798,800,805,810,811,814,815,816,817,820,825}'.
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 90ae2e6ce7..3fb1738f2a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -463,34 +463,34 @@ static int included_patches[] = {
// 828,
// 827,
826,
- // 825,
+ 825,
// 824 NA
823,
// 822,
// 821,
- // 820,
+ 820,
// 819,
// 818,
- // 817,
- // 816,
- // 815,
- // 814,
+ 817,
+ 816,
+ 815,
+ 814,
813,
// 812,
- // 811,
- // 810,
+ 811,
+ 810,
809,
// 808 NA
807,
806,
- // 805,
+ 805,
// 804,
803,
802,
801,
- // 800,
+ 800,
799,
- // 798,
+ 798,
// 797,
// 796 NA
795,