Mercurial > vim
comparison src/version.c @ 18267:da6a7491e148 v8.1.2128
patch 8.1.2128: renamed libvterm sources makes merging difficult
Commit: https://github.com/vim/vim/commit/93268054428fe3a6bbe3f89d2def2fec4eabcf5f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 10 13:22:54 2019 +0200
patch 8.1.2128: renamed libvterm sources makes merging difficult
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 10 Oct 2019 13:30:04 +0200 |
| parents | fe5afdc03bd2 |
| children | 57b18521216f |
comparison
equal
deleted
inserted
replaced
| 18266:4af19863e264 | 18267:da6a7491e148 |
|---|---|
| 751 NULL | 751 NULL |
| 752 }; | 752 }; |
| 753 | 753 |
| 754 static int included_patches[] = | 754 static int included_patches[] = |
| 755 { /* Add new patch number below this line */ | 755 { /* Add new patch number below this line */ |
| 756 /**/ | |
| 757 2128, | |
| 756 /**/ | 758 /**/ |
| 757 2127, | 759 2127, |
| 758 /**/ | 760 /**/ |
| 759 2126, | 761 2126, |
| 760 /**/ | 762 /**/ |