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: 8a85c25 1fc82d8)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 21 Oct 2014 01:17:06 +0000 (21:17 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 21 Oct 2014 01:17:06 +0000 (21:17 -0400)
commit	eed18bf1fd1162872e196091ab795a773f277e8e
tree	f3fee81f1e7fdf23b57138740437e07ce244ede8	tree \| snapshot
parent	8a85c254de2528be0f3ff154fa24df65e6557c1a	commit \| diff
parent	1fc82d89a8a603754d17a35be1ce78e66d0b6fd6	commit \| diff

Merge from emacs-24

15 files changed:

admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispintro/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/cedet/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/mh-e/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/url/ChangeLog	diff1 \|	diff2 \|	blob \| history
oldXMenu/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

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