diff options
| author | Paul Eggert | 2016-01-30 11:43:27 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-30 11:43:27 -0800 |
| commit | 3005605776955593e0b416de9e1ebf158114343e (patch) | |
| tree | ae2bec4f10425bd61e2a90563edc178d382bb4b8 /src/alloc.c | |
| parent | cb4e054e41cdb7e398351a5ae8224759e721349e (diff) | |
| parent | ad879b7f7e049160c45361fe8a12580801ba035b (diff) | |
| download | emacs-3005605776955593e0b416de9e1ebf158114343e.tar.gz emacs-3005605776955593e0b416de9e1ebf158114343e.zip | |
; 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
Diffstat (limited to 'src/alloc.c')
0 files changed, 0 insertions, 0 deletions