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: 0065d05 e504613)

author	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 5 Aug 2011 02:19:34 +0000 (19:19 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 5 Aug 2011 02:19:34 +0000 (19:19 -0700)
commit	0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3
tree	5f09676e1b87f3f274a60fe79728f84a3d0c9a9b	tree \| snapshot
parent	0065d05491ce5981ea20896bb26d21dcd31e6769	commit \| diff
parent	e504613cc63d2a3925c546177a04637e25a1a4ae	commit \| diff

Merge from trunk.

13 files changed:

src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/bidi.c	diff1 \|	diff2 \|	blob \| history
src/callproc.c	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/emacs.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/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history

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