Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu
authorGlenn Morris <rgm@gnu.org>
Sun, 8 Jun 2014 00:35:27 +0000 (17:35 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 8 Jun 2014 00:35:27 +0000 (17:35 -0700)
commit36cf8493aff99b652b2ad8c9e4d55a18688e8484
treef8ff499c2ee5e91b20d8576841f0e6bf91d1ba34
parent2be772ff45057215c1c70252008c1f9703ef3bff
parentda8de2908c35ad1fd5c437486d2ea5f6ebb75ca3
Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu
21 files changed:
ChangeLog
configure.ac
doc/emacs/ChangeLog
doc/emacs/ack.texi
doc/emacs/emacs.texi
doc/lispref/ChangeLog
doc/lispref/os.texi
etc/ChangeLog
etc/NEWS
etc/TODO
lisp/ChangeLog
lisp/emacs-lisp/package.el
lisp/menu-bar.el
lisp/net/tramp.el
lisp/startup.el
lisp/vc/vc-hg.el
nt/INSTALL
src/ChangeLog
src/callproc.c
src/sysdep.c
src/term.c