Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu
commit6ef2e5ef5278a807132b78c42de402925b20bfb3
authorGlenn Morris <rgm@gnu.org>
Wed, 21 Nov 2012 04:47:55 +0000 (20 20:47 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 21 Nov 2012 04:47:55 +0000 (20 20:47 -0800)
treee5711cdfcdf8a152416c2a96e399695285a4a3a8
parenteadf1faa3cb5eea8c25a5166a9a97ebd63525c56
parentb6729a180f4b81ac26bd7b61f5330643b2d5e994
Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu
17 files changed:
ChangeLog
configure.ac
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/os.texi
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/calendar/time-date.el
lisp/files.el
lisp/net/tramp.el
nt/ChangeLog
src/ChangeLog
src/emacs.c
src/fileio.c
src/w32.c
src/w32term.h