Merge remote-tracking branch 'origin/develop'

koron · Mar 16, 2019 · 09eb4ae · 09eb4ae
2 parents 322111e + dcbe1bd
commit 09eb4ae
Show file tree

Hide file tree

Showing 14 changed files with 847 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 *.sw?
-/tmp/
+tmp/
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
-VIM_VER		= 8.1.0005
-PATCHSET_VER	= 20180520
+VIM_VER		= 8.1.1010
+PATCHSET_VER	= 20190317
 
 VIM_VER_SHORT	= 81
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     *.sw?
-    /tmp/
+    tmp/