HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4a1b123 92d5961)

author	Glenn Morris <rgm@gnu.org>
	Fri, 4 Jan 2013 19:22:37 +0000 (11:22 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Fri, 4 Jan 2013 19:22:37 +0000 (11:22 -0800)
commit	0f668a4db4a33f98f84613513af3efea521b4847
tree	ab85f709ca11c2390dddfc1756656293d6762e55	tree \| snapshot (tar.gz zip)
parent	4a1b123d1517bcad22f936df9c39b61fbc3e5359	commit \| diff
parent	92d596112248baecbe6789d450d8e8ea405de19b	commit \| diff

Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca

13 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/Makefile.in	diff1 \|	diff2 \|	blob \| history
doc/misc/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/etags.el	diff1 \|	diff2 \|	blob \| history
lisp/term.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history

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