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: 93b31b5 b62da77)

author	Glenn Morris <rgm@gnu.org>
	Thu, 28 Aug 2014 01:59:29 +0000 (18:59 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Thu, 28 Aug 2014 01:59:29 +0000 (18:59 -0700)
commit	6d26235315194737c4dc8653cf6d05177a10fa9c
tree	4a80f49f2073d80610931dd8706e90527a98340b	tree
parent	93b31b57283d369fefc5c95082d7b09288f05128	commit \| diff
parent	b62da77c1c94b393f8be7854ff1cb30b012aa238	commit \| diff

Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org

16 files changed:

admin/authors.el	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/net/shr.el	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-adb.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
msdos/ChangeLog	diff1 \|	diff2 \|	blob \| history
msdos/sed2v2.inp	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/conf_post.h	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/indent.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history