HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3794a2d c9e799d)

author	Glenn Morris <rgm@gnu.org>
	Sat, 25 Jun 2011 18:21:00 +0000 (11:21 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 25 Jun 2011 18:21:00 +0000 (11:21 -0700)
commit	11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20
tree	4359edf5c3e99c0abcf9eff028a7a2609f483745	tree \| snapshot (tar.gz zip)
parent	3794a2d3a43433c27f65c902bfdc21479d7d309f	commit \| diff
parent	c9e799dbb100c5161f7a485452d29f554d95e6c7	commit \| diff

Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/display.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/keymaps.texi	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/net/ange-ftp.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history

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