]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'master' into harfbuzz
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 23 May 2019 01:53:23 +0000 (10:53 +0900)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 23 May 2019 01:53:23 +0000 (10:53 +0900)
commitb40dde705af4d53853de6185a2468153b442dc9a
treee8dabba695163c2d07439fad6accff761f8f714c
parent5d7dafacf4afc888511649f6fc24c28210cd0dfc
parent03feb9376b54c489e24478954a11061e9b0d6db7
Merge branch 'master' into harfbuzz
13 files changed:
configure.ac
etc/NEWS
lisp/composite.el
src/font.h
src/ftcrfont.c
src/ftfont.c
src/ftfont.h
src/ftxfont.c
src/indent.c
src/macfont.m
src/xdisp.c
src/xfns.c
src/xftfont.c