merge trunk
commit0cdbf84521791935fdfeabf2e84f585cc64db325
authorKenichi Handa <handa@gnu.org>
Tue, 13 Nov 2012 14:24:26 +0000 (13 23:24 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 13 Nov 2012 14:24:26 +0000 (13 23:24 +0900)
tree68a169af3af4a8859685682ab07c05e8f9ff93b3
parente1bf05c1fbf63087801c242208212df133921ed1
parent5745cae6984ed60299a89485aaea8f2f3fb67382
merge trunk
src/ChangeLog
src/font.c