Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org
commitc5bc2d1d0558bbaa29ef04f9bd7bef50146382ab
authorGlenn Morris <rgm@gnu.org>
Mon, 3 Dec 2012 01:08:31 +0000 (2 17:08 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 3 Dec 2012 01:08:31 +0000 (2 17:08 -0800)
treebeabc46c767d32fe6cda79f0567834d5ea8225ee
parent1bf3989cd4ebffdeeebfaaca83c6866416c3908a
parent328dac0d42a2b395a327c0eda0ed4bbcec4f6c55
Merge from emacs-24; up to 2012-11-23T06:23:28Z!cyd@gnu.org
16 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/misc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/files.el
lisp/gnus/ChangeLog
lisp/simple.el
msdos/ChangeLog
src/ChangeLog
src/data.c
src/fileio.c
src/w32.c
src/w32fns.c