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: ec11ab9 e175fab)

author	Glenn Morris <rgm@gnu.org>
	Sun, 12 Oct 2014 22:56:45 +0000 (15:56 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 12 Oct 2014 22:56:45 +0000 (15:56 -0700)
commit	b1d5ab0352b6132eee4feaf9091ce7dc7a3e6a84
tree	df2e6708c30f53f071bd824c49c7f00dfbe0ffba	tree
parent	ec11ab9b783fc1f2c0ce858a711baa5f728c238b	commit \| diff
parent	e175fabcdd37f89db13ab90615cf0baa7bade4d9	commit \| diff

Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

15 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/emacs/help.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/control.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/elisp.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/org.texi	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/org/org.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/prolog.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/frame.c	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history