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: b613941 bc7d7ea)

author	Chong Yidong <cyd@stupidchicken.com>
	Sun, 22 Aug 2010 20:02:16 +0000 (16:02 -0400)
committer	Chong Yidong <cyd@stupidchicken.com>
	Sun, 22 Aug 2010 20:02:16 +0000 (16:02 -0400)
commit	b0126eac41487b9bca5af5cbb2212ff5b2c58b80
tree	680ba932d259776ebfdb6d424fa8f668e1001f7c	tree \| snapshot
parent	b613941ba003bbf5024415ac4f8c2a0e12434751	commit \| diff
parent	bc7d7ea63ba9d98b3ecc3b6decf4392a651dcbfb	commit \| diff

Merge changes from emacs-23 branch.

16 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
leim/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/easy-mmode.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/ido.el	diff1 \|	diff2 \|	blob \| history
lisp/menu-bar.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/make-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
lisp/woman.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/doc.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/s/hpux10-20.h	diff1 \|	diff2 \|	blob \| history

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