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: 6b7d077 f314e84)

author	Glenn Morris <rgm@gnu.org>
	Mon, 11 Aug 2014 00:59:34 +0000 (17:59 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 11 Aug 2014 00:59:34 +0000 (17:59 -0700)
commit	c7367d2de3343e56171c4fe6d439a3ed5f40d06c
tree	54fe9166f6b4320d9518bbac11e2d575a9fda7c2	tree \| snapshot
parent	6b7d077506304f440d311fa7b29d210b7a3e121c	commit \| diff
parent	f314e84fce8b394da20aa1d69121c74fb34f9a1e	commit \| diff

Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org

15 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/info.el	diff1 \|	diff2 \|	blob \| history
lisp/mouse.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
lisp/window.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/coding.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/fontset.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history

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