code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6d03e7b 052f924)

author	Eli Zaretskii <eliz@gnu.org>
	Fri, 2 Nov 2012 09:00:44 +0000 (11:00 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Fri, 2 Nov 2012 09:00:44 +0000 (11:00 +0200)
commit	5ade42a5114255c43117065494b96d480c1e1588
tree	16389d549207bbdc695b58400d79c996d2da753f	tree
parent	6d03e7beda333663080a64af902231342fd941cf	commit \| diff
parent	052f924a01f8a65ca0bfc9e6584302613e019489	commit \| diff

Merge from trunk after 24.3 was moved to emacs-24 branch.

lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
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/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32proc.c	diff1 \|	diff2 \|	blob \| history