| commit | 88e8f9f14434a7cd538d0c159dc432bea869a5bd | [log] [tgz] |
|---|---|---|
| author | Bram Moolenaar <Bram@vim.org> | Wed Jan 20 22:48:02 2016 +0100 |
| committer | Bram Moolenaar <Bram@vim.org> | Wed Jan 20 22:48:02 2016 +0100 |
| tree | 0cc419113941be1200c09d347f96bf76cc7acaab | |
| parent | a7c3795a2e65233ba2d187d680acc83bf6bf4ef5 [diff] [blame] |
patch 7.4.1147
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
diff --git a/src/version.c b/src/version.c index 02f34a8..34666f9 100644 --- a/src/version.c +++ b/src/version.c
@@ -742,6 +742,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1147, +/**/ 1146, /**/ 1145,