summaryrefslogtreecommitdiff
path: root/src/libvterm/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-10 13:22:54 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-10 13:22:54 +0200
commit93268054428fe3a6bbe3f89d2def2fec4eabcf5f (patch)
treed8e0be653481f2f7010d3218e1e0181801aaeefc /src/libvterm/src
parent14c01f83487d5c53192297a710eda2b8a4ab17c9 (diff)
downloadvim-git-93268054428fe3a6bbe3f89d2def2fec4eabcf5f.tar.gz
patch 8.1.2128: renamed libvterm sources makes merging difficultv8.1.2128
Problem: Renamed libvterm sources makes merging difficult. Solution: Rename back to the original name and only rename the .o files. Also clean the libvterm build artifacts. (James McCoy, closes #5027)
Diffstat (limited to 'src/libvterm/src')
-rw-r--r--src/libvterm/src/mouse.c (renamed from src/libvterm/src/termmouse.c)0
-rw-r--r--src/libvterm/src/screen.c (renamed from src/libvterm/src/termscreen.c)0
2 files changed, 0 insertions, 0 deletions
diff --git a/src/libvterm/src/termmouse.c b/src/libvterm/src/mouse.c
index ae74cfc4b..ae74cfc4b 100644
--- a/src/libvterm/src/termmouse.c
+++ b/src/libvterm/src/mouse.c
diff --git a/src/libvterm/src/termscreen.c b/src/libvterm/src/screen.c
index 6ad0e1afd..6ad0e1afd 100644
--- a/src/libvterm/src/termscreen.c
+++ b/src/libvterm/src/screen.c