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: 5af73b0 196716c)

author	Juanma Barranquero <lekktu@gmail.com>
	Wed, 26 Mar 2014 15:57:13 +0000 (16:57 +0100)
committer	Juanma Barranquero <lekktu@gmail.com>
	Wed, 26 Mar 2014 15:57:13 +0000 (16:57 +0100)
commit	16adf2e6eb1ddf0b32ebea2d5ce8fa1e4c226614
tree	29b782fd6e7c44a834dd09442a551520e30bcbd6	tree \| snapshot
parent	5af73b0fe8975eeb47fb270819b4143c18d71caa	commit \| diff
parent	196716cf35f81bea108c3b75362e92c86ed1c016	commit \| diff

Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

14 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/files.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/frameset.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/insdel.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history

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