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: d6de176 c54ebba)

author	Eli Zaretskii <eliz@gnu.org>
	Mon, 8 Oct 2012 13:06:31 +0000 (15:06 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Mon, 8 Oct 2012 13:06:31 +0000 (15:06 +0200)
commit	7014794467aac02be3a935a093e1bfb8ad410c12
tree	0aa27b30dcdc8fc4e63c8d88d9b878d0b3ff9765	tree \| snapshot
parent	d6de17607045c1d33826a12983e33deb73426457	commit \| diff
parent	c54ebba4e076caeb6105c6bb682252b139a169fa	commit \| diff

Merge from trunk after cygw32 commit, and resolve conflicts.

12 files changed:

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/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
src/w32term.h	diff1 \|	diff2 \|	blob \| history

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