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: 7e4289a f253ef6)

author	Chong Yidong <cyd@stupidchicken.com>
	Fri, 16 Jul 2010 15:42:15 +0000 (11:42 -0400)
committer	Chong Yidong <cyd@stupidchicken.com>
	Fri, 16 Jul 2010 15:42:15 +0000 (11:42 -0400)
commit	fea9cabd275c3d5809b824a6e4a1446441a6793e
tree	a5eb69edf85fe28f6b4d5bbc8e3c2c3cfc3d0d37	tree
parent	7e4289ad2bbd9f8ed18902f652d3f07380b227bf	commit \| diff
parent	f253ef6a8e0dd71cf9fd58e3d9407549d30e091d	commit \| diff

Merge changes from emacs-23 branch.

lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/gtkutil.c	diff1 \|	diff2 \|	blob \| history
src/gtkutil.h	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/xfns.c	diff1 \|	diff2 \|	blob \| history
src/xmenu.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history
src/xterm.h	diff1 \|	diff2 \|	blob \| history