Merge from emacs--rel--22
commitf67e15be8d94718b2e2ea7da68eb0b2dc94ce016
authorMiles Bader <miles@gnu.org>
Sun, 4 May 2008 19:46:16 +0000 (4 19:46 +0000)
committerMiles Bader <miles@gnu.org>
Sun, 4 May 2008 19:46:16 +0000 (4 19:46 +0000)
treeb7cdaa984d777c3bd0425f2ca2612d9a1de0d832
parentf8a295058a5682dbc70f48f376fe51a18d21281a
parent092a8af3e7cc0d72c417f9eb19c7ac61ef782a87
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1142
ChangeLog
configure
configure.in
src/ChangeLog
src/config.in
src/image.c
src/macgui.h
src/macterm.c
src/macterm.h
src/s/darwin.h