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: 4d6abf2 ef3b719)

author	Glenn Morris <rgm@gnu.org>
	Mon, 21 Jul 2014 06:03:08 +0000 (02:03 -0400)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 21 Jul 2014 06:03:08 +0000 (02:03 -0400)
commit	190644a0115a592f237b5f7c91f0f96e82edb864
tree	d3a5848df4a3f2fe4e67be8032c9195db0df4985	tree \| snapshot
parent	4d6abf2449a4c4da10949b50510b90d6d019ae7c	commit \| diff
parent	ef3b7194838482c4bcb55beb951f3a8e2e0f44ac	commit \| diff

Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org

15 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/emacs.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/bs.el	diff1 \|	diff2 \|	blob \| history
lisp/dired.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/hideif.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/macfont.m	diff1 \|	diff2 \|	blob \| history
src/nsterm.h	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history

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