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: 6e6c82a 67b0de1)

author	Paul Eggert <eggert@cs.ucla.edu>
	Sat, 25 Feb 2012 06:41:40 +0000 (22:41 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Sat, 25 Feb 2012 06:41:40 +0000 (22:41 -0800)
commit	a89654f8f34114db543cb91363e8fded6d73e986
tree	5ac508597ef2aa460308b4b26c244779e48cdb40	tree \| snapshot
parent	6e6c82a4e687708d5a7a3887f92db45bd74da276	commit \| diff
parent	67b0de11479247cb8bd8491e10e0b464046f18be	commit \| diff

Merge from trunk.

17 files changed:

src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/gnutls.c	diff1 \|	diff2 \|	blob \| history
src/gtkutil.c	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/keymap.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/nsselect.m	diff1 \|	diff2 \|	blob \| history
src/syntax.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xfns.c	diff1 \|	diff2 \|	blob \| history
src/xselect.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history

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