aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfont.c
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-11-18 23:15:21 -0800
committerPaul Eggert <[email protected]>2011-11-18 23:15:21 -0800
commit9898bd0e5b0e51ce9040e11ae25c9a07ec08eb4f (patch)
tree25387ffdec4119c749c9317c55d185cf39cfcb3f /src/xfont.c
parent3616c8b26bfaf024d803371b85bee571cd6f061f (diff)
parent2071918ec9a1562d5f0aa6218d98f80318a33466 (diff)
parent61ccba97a11dd945138a5459955456ebb19b9e74 (diff)
Merge from trunk.