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: 2a0bae5 fb02552)

author	Glenn Morris <rgm@gnu.org>
	Sat, 12 Jul 2014 17:53:29 +0000 (10:53 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 12 Jul 2014 17:53:29 +0000 (10:53 -0700)
commit	b39c4d7b33952e0125fbefbcb3d9f528b6570f40
tree	17fd0630dacfe29b0c2486b9f5c923293e872a70	tree
parent	2a0bae50e3611a6bd2d584f7a85677b74f1aa71b	commit \| diff
parent	fb02552638b0c653bfc3d269d879fdffba37bd31	commit \| diff

Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
Makefile.in	diff1 \|	diff2 \|	blob \| history
etc/PROBLEMS	diff1 \|	diff2 \|	blob \| history
lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xfns.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history