merge trunk
commitf6f3366160e26ff5984f287e60616ec9f90acfa3
authorKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (1 16:53 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (1 16:53 +0900)
tree9f5c8dc73cad6319a8fdf1ab22fd4e9901089e50
parent65b6b59a8030b09d2a32ee88837a061e22751988
parentca7c89d8f52b34f694031f496600f949640ff9c4
merge trunk
lisp/ChangeLog
lisp/faces.el
src/ChangeLog
src/xterm.c