Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu
authorGlenn Morris <rgm@gnu.org>
Sat, 12 Mar 2011 19:19:47 +0000 (11:19 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 12 Mar 2011 19:19:47 +0000 (11:19 -0800)
commit09d9db2c4921cb2eb0974892164dd03d6bffdd80
tree7165f97f16ea0eaab567db2a45f69d1cdf66bdce
parent54ce11a161cd756047fccdfc128dc0527692ea06
parent6efb972c00a9ea8ffa84118199aa59c2d3a3b50e
Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu
doc/emacs/ChangeLog
doc/emacs/msdog.texi
lisp/ChangeLog
lisp/ebuff-menu.el
lisp/files.el
lisp/server.el
src/ChangeLog
src/fringe.c
src/unexmacosx.c