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: eadf1fa b6729a1)

author	Glenn Morris <rgm@gnu.org>
	Wed, 21 Nov 2012 04:47:55 +0000 (20:47 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 21 Nov 2012 04:47:55 +0000 (20:47 -0800)
commit	6ef2e5ef5278a807132b78c42de402925b20bfb3
tree	e5711cdfcdf8a152416c2a96e399695285a4a3a8	tree \| snapshot
parent	eadf1faa3cb5eea8c25a5166a9a97ebd63525c56	commit \| diff
parent	b6729a180f4b81ac26bd7b61f5330643b2d5e994	commit \| diff

Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu

17 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/os.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/windows.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/calendar/time-date.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	diff1 \|	diff2 \|	blob \| history
nt/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/w32.c	diff1 \|	diff2 \|	blob \| history
src/w32term.h	diff1 \|	diff2 \|	blob \| history

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