code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 288cf4e 3690126)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 16 Jun 2010 20:08:41 +0000 (16:08 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 16 Jun 2010 20:08:41 +0000 (16:08 -0400)
commit	2a64315a111fb4da67e9c40c9b69045c4f63d619
tree	2e7ba99465f6eb5eae64361767af5bc5fff7aca4	tree
parent	288cf4e907c0350eb24824016763bddd09df8ea8	commit \| diff
parent	36901266a8acb83880fefee50c93abb09f64533b	commit \| diff

Merge from emacs-23

16 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
INSTALL	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/basic.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/org.texi	diff1 \|	diff2 \|	blob \| history
etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/NEWS.23	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/cl-macs.el	diff1 \|	diff2 \|	blob \| history
lisp/font-lock.el	diff1 \|	diff2 \|	blob \| history
lisp/url/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/url/url-vars.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-annotate.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-svn.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history