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: 05a859c e4e4688)

author	Glenn Morris <rgm@gnu.org>
	Sat, 10 Nov 2012 23:13:33 +0000 (15:13 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 10 Nov 2012 23:13:33 +0000 (15:13 -0800)
commit	6baf66d53bbedd85a443e0d69d1f4311a93f0677
tree	38d7a00d5f7d5aecb86285d334fa15a31e5fbab1	tree
parent	05a859c1bd9cd07b2c0fad06a0694e88ea929fcf	commit \| diff
parent	e4e46889223296e8875548d278340b21db449a4a	commit \| diff

Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca

12 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/advice.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/cl-extra.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/cl-lib.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/gv.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history