Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.
commit8546720e6f25eb988e8215de6678798053031440
authorGlenn Morris <rgm@gnu.org>
Sat, 9 Apr 2011 17:40:29 +0000 (9 10:40 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 9 Apr 2011 17:40:29 +0000 (9 10:40 -0700)
tree224cd4541048b3cc2847c652dc0aa3347a58a381
parenta53e2e898b96c8024de5a1a413826a6a59dd6b54
parent140745c368c00011226815fd2a891764340bf87f
Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.
lisp/ChangeLog
src/ChangeLog
src/ftfont.c
src/xmenu.c
src/xselect.c
src/xterm.c