HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 87c141c b15736e)

author	Eli Zaretskii <eliz@gnu.org>
	Tue, 9 Oct 2012 18:28:06 +0000 (20:28 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Tue, 9 Oct 2012 18:28:06 +0000 (20:28 +0200)
commit	b97f22cdad55a0964758cef3a19ce3fa1098657d
tree	8d078a5b2aab3f55708a5f8eeaf8ca0f022e6ee3	tree \| snapshot (tar.gz zip)
parent	87c141ce9750881f6203148e3c49d00710cd472e	commit \| diff
parent	b15736e6e33a52021a2a91b0b3360cd5a9803405	commit \| diff

Merge from trunk.

lisp/ChangeLog	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/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history

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