Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org
commit2ac9538d674ab0aa937d22b68fef9136ddd904b9
authorGlenn Morris <rgm@gnu.org>
Sun, 18 Nov 2012 01:52:36 +0000 (17 17:52 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 18 Nov 2012 01:52:36 +0000 (17 17:52 -0800)
tree81cf8c6762c0443ca2debe490ecfa7c1e55d2da0
parentc9ed8e3d2ba6c7d6eda82a39cbfa87729f1ca53e
parent291a654dad6d4604ed4db80885b3af04e64c944f
Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org
13 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/emacs-lisp/cl-lib.el
lisp/filecache.el
lisp/image.el
lisp/subr.el
lisp/vc/vc-svn.el
src/ChangeLog
src/nsterm.m
src/w32term.h