code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 254a60e 285935f)

author	Miles Bader <miles@gnu.org>
	Thu, 24 Apr 2008 05:11:07 +0000 (05:11 +0000)
committer	Miles Bader <miles@gnu.org>
	Thu, 24 Apr 2008 05:11:07 +0000 (05:11 +0000)
commit	08861c5cb87e91e83e5b0bf53cb53c1377434c8f
tree	113fbc5d0f03e87489fb365f6383c4423469e492	tree
parent	254a60ecbfd8a7a89a9ee52ae3b0839b425c60c0	commit \| diff
parent	285935fe5dbd6c60096abe4991ddac12d81a3ab6	commit \| diff

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1126

lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/term/mac-win.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/macterm.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history