merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 11:47:45 +0000 (20:47 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 11:47:45 +0000 (20:47 +0900)
commitba13e6168a07a085c0ca8e67c91640b84ee0c1fd
treea63038205a6803ba06f5e17eda974c3ab23e57fb
parentdcbd9236f7be9da4e658fd559dfbd7454f4b6018
parenta8c729af93b08531e5e3f3fff6f16a55c8baac3f
merge trunk
src/ChangeLog
src/font.c