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: b94de89 a05731a)

author	Tom Tromey <tromey@redhat.com>
	Mon, 20 Aug 2012 13:34:41 +0000 (07:34 -0600)
committer	Tom Tromey <tromey@redhat.com>
	Mon, 20 Aug 2012 13:34:41 +0000 (07:34 -0600)
commit	49bc1a9dfc6e81a370bf12157c3c573743ee200a
tree	24df8b040aff367adc11a2c676334ec238651e1d	tree \| snapshot
parent	b94de893429bbfbb27572c8c3118fcc876957adb	commit \| diff
parent	a05731a0cc2553af0469bd9b7d6ac10cd2e6a817	commit \| diff

Merge from trunk

12 files changed:

src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/buffer.h	diff1 \|	diff2 \|	blob \| history
src/data.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/print.c	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/process.h	diff1 \|	diff2 \|	blob \| history
src/search.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history

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