]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb4e054 ad879b7)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:43:27 +0000 (11:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:43:27 +0000 (11:43 -0800)
The following commits were skipped:

ad879b7 Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
4a3db0f support rendering of wider range of combinging characters by ftfont backend


Trivial merge