Merge from emacs--rel--22
commit7ad8fe5e2876518a8f33b80050f98dab4ff78398
authorMiles Bader <miles@gnu.org>
Sat, 26 Jul 2008 09:13:26 +0000 (26 09:13 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 26 Jul 2008 09:13:26 +0000 (26 09:13 +0000)
treeee7126ca02830b9d93ab6df1d9a0274e2b576285
parentd62672f36a4aaf33ded7ced6e50c44b6a43e4942
parent4874e0882eff39f280c9b2b907abe411833f79a8
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1356
src/ChangeLog
src/image.c
src/macterm.c
src/macterm.h
src/w32inevt.c