|
| From: | Eli Zaretskii |
| Subject: | Re: Missing changes in merges from emacs-25 to master |
| Date: | Fri, 25 Mar 2016 11:52:07 +0300 |
There seems to be another issue with merging to master: we get back
commits that were cherry-picked from master to the release branch.
Here's one example; I don't know whether there are others:
commit ad879b7f7e049160c45361fe8a12580801ba035b
Author: K. Handa <address@hidden>
Date: Thu Jan 14 21:48:44 2016 +0900
Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
* src/ftfont.c (ftfont_shape_by_flt): Fix previous change. Access the
second glyph only when there are enough glyphs.
(cherry picked from commit 9835757013569673854b692ccbb58bfb3c3ed1f7)
| [Prev in Thread] | Current Thread | [Next in Thread] |