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: 5ade42a c708524)

author	Eli Zaretskii <eliz@gnu.org>
	Tue, 13 Nov 2012 14:17:18 +0000 (16:17 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Tue, 13 Nov 2012 14:17:18 +0000 (16:17 +0200)
commit	3c4ca7155293ffc2d04708007131bcbc882d8913
tree	61787be8cd43b6fb3d5159852fbd186eea404de7	tree \| snapshot
parent	5ade42a5114255c43117065494b96d480c1e1588	commit \| diff
parent	c708524567662c8911c5ab2695acc7bda0383705	commit \| diff

Merge from trunk.

12 files changed:

lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32proc.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/w32term.h	diff1 \|	diff2 \|	blob \| history

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