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: 141f1ff 257b3b0)

author	Eli Zaretskii <eliz@gnu.org>
	Thu, 5 Sep 2013 08:01:04 +0000 (11:01 +0300)
committer	Eli Zaretskii <eliz@gnu.org>
	Thu, 5 Sep 2013 08:01:04 +0000 (11:01 +0300)
commit	41306318777a942420bc4feadbfacf662ea179dc
tree	669e5cca02f95d6064ce73c0d3fbbf91b8c8b563	tree \| snapshot
parent	141f1ff7a40cda10f0558e891dd196a943a5082e	commit \| diff
parent	257b3b03cb1cff917e0b3b7832ad3eab5b59f257	commit \| diff

Merge from trunk after a lot of time.

src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/menu.c	diff1 \|	diff2 \|	blob \| history
src/menu.h	diff1 \|	diff2 \|	blob \| history
src/msdos.c	diff1 \|	diff2 \|	blob \| history
src/term.c	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	diff1 \|	diff2 \|	blob \| history
src/w32console.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

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