]> git.eshelyaron.com Git - emacs.git/commitdiff
merge trunk
authorKenichi Handa <handa@etlken>
Thu, 8 Jul 2010 08:09:35 +0000 (17:09 +0900)
committerKenichi Handa <handa@etlken>
Thu, 8 Jul 2010 08:09:35 +0000 (17:09 +0900)
1  2 
src/font.c
src/font.h

diff --cc src/font.c
Simple merge
diff --cc src/font.h
Simple merge