]> code.delx.au - gnu-emacs/commit
; 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)
commit3005605776955593e0b416de9e1ebf158114343e
treeae2bec4f10425bd61e2a90563edc178d382bb4b8
parentcb4e054e41cdb7e398351a5ae8224759e721349e
parentad879b7f7e049160c45361fe8a12580801ba035b
; Merge from origin/emacs-25

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