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: a9f8b49 286b406)

author	Miles Bader <miles@gnu.org>
	Mon, 10 Mar 2008 00:49:47 +0000 (00:49 +0000)
committer	Miles Bader <miles@gnu.org>
	Mon, 10 Mar 2008 00:49:47 +0000 (00:49 +0000)
commit	56388398e7a1251497f002072c061002ec9d9e81
tree	b9b4a189840efadb47820e9fc7ad447e58d4c89e	tree
parent	a9f8b49b44a4083d8e5a2429306ce41e7f3cfe0e	commit \| diff
parent	286b40657d59d8614f7a71844a6e4a7e8819da1b	commit \| diff

Merge from emacs--rel--22

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

16 files changed:

etc/AUTHORS	diff1 \|	diff2 \|	blob \| history
etc/NEWS.22	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/gnus-sum.el	diff1 \|	diff2 \|	blob \| history
lisp/help.el	diff1 \|	diff2 \|	blob \| history
lisp/iswitchb.el	diff1 \|	diff2 \|	blob \| history
lisp/net/socks.el	diff1 \|	diff2 \|	blob \| history
lisp/newcomment.el	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	diff1 \|	diff2 \|	blob \| history
lisp/textmodes/css-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/vc-mtn.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history