git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6aed001 d3b7a90)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 30 Sep 2014 23:19:31 +0000 (19:19 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 30 Sep 2014 23:19:31 +0000 (19:19 -0400)
commit	07bec0fc67ee0b26685f0ec7f28d9b73f67bf3de
tree	222adf06960f86aa8b2f560217d39c9fe39d3996	tree \| snapshot
parent	6aed001ad31d41f028d77e66e597b7b3ab4e31ae	commit \| diff
parent	d3b7a90bc2ad20192d1afd23eb1aa6a18ceda569	commit \| diff

Merge from emacs-24

12 files changed:

etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/package.el	diff1 \|	diff2 \|	blob \| history
lisp/erc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/mh-e/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.