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: f0b7f5a a2e35ef)

author	Juanma Barranquero <lekktu@gmail.com>
	Mon, 11 Oct 2010 23:57:49 +0000 (01:57 +0200)
committer	Juanma Barranquero <lekktu@gmail.com>
	Mon, 11 Oct 2010 23:57:49 +0000 (01:57 +0200)
commit	4c14013dbec3a2f130a38e61e885f1e8cc6c325b
tree	b74121c8de587c217f0d146752e8893d0874aae7	tree \| snapshot
parent	f0b7f5a884806112b6a938b9c31607ea005431d3	commit \| diff
parent	a2e35ef5d52031e0fa184d1863fe7cb7043ef637	commit \| diff

Merge changes from emacs-23 branch.

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/man/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/man/emacs.1	diff1 \|	diff2 \|	blob \| history
etc/NEWS.23	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/cus-start.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/lisp.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/shadow.el	diff1 \|	diff2 \|	blob \| history
lisp/term/ns-win.el	diff1 \|	diff2 \|	blob \| history
make-dist	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history

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