]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9835757 ee83b77)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorK. Handa <handa@gnu.org>
Thu, 14 Jan 2016 12:55:43 +0000 (21:55 +0900)
committerK. Handa <handa@gnu.org>
Thu, 14 Jan 2016 12:55:43 +0000 (21:55 +0900)
1  2 
src/ftfont.c patch | diff1 | diff2 | blob | history

diff --cc src/ftfont.c
Simple merge