aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-08-05 10:28:02 +0800
committerckelsel <ckelsel@hotmail.com>2017-08-05 10:28:02 +0800
commitc972efc9d113232b2688ea5c2adc8834a4eda195 (patch)
treef1031a6382ff23b74a247d4d3371b029211ee920 /src
parent0743684199238006331032ca26a947c579c59a5e (diff)
parent55c0401dfd137a5e173d8551f763cb4c6fed56e1 (diff)
downloadrneovim-c972efc9d113232b2688ea5c2adc8834a4eda195.tar.gz
rneovim-c972efc9d113232b2688ea5c2adc8834a4eda195.tar.bz2
rneovim-c972efc9d113232b2688ea5c2adc8834a4eda195.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src')
-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 7f0b45e896..f2b56e0108 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -595,7 +595,7 @@ static const int included_patches[] = {
// 137,
136,
135,
- // 134,
+ 134,
133,
// 132,
// 131,