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: 27e81f9 d8899d0)

author	Glenn Morris <rgm@gnu.org>
	Wed, 9 Jul 2014 02:04:12 +0000 (19:04 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 9 Jul 2014 02:04:12 +0000 (19:04 -0700)
commit	5613a6f6d52bca0018c5777aba67a99f51016a35
tree	c070100c79442ae2f9876f82af4eeebadc39249c	tree
parent	27e81f9f4e368176a3b17ceeadd2e0aa5dd9d1ed	commit \| diff
parent	d8899d09b992d733dc1cc6ec93b11cb75ce84f5d	commit \| diff

Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca

15 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/todo-mode.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
etc/TODO	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/calendar/todo-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/sh-script.el	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/w32.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history