]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 536f48e 91917dd)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorK. Handa <handa@gnu.org>
Sun, 3 Jan 2016 08:53:43 +0000 (17:53 +0900)
committerK. Handa <handa@gnu.org>
Sun, 3 Jan 2016 08:53:43 +0000 (17:53 +0900)
1  2 
src/font.h patch | diff1 | diff2 | blob | history

diff --cc src/font.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.