Merge from emacs-24; up to r117499
commit4ea36cd882de31951604c8c73851912694063a44
authorGlenn Morris <rgm@gnu.org>
Mon, 15 Sep 2014 00:20:21 +0000 (14 17:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 15 Sep 2014 00:20:21 +0000 (14 17:20 -0700)
tree0223f10e7cf78486482150a94516f221c1bd9ab7
parente6a749943d39a33e4009f08fd48e32426bc109fc
parenta44f927a16f030ba39823c4e6af918a3b269149e
Merge from emacs-24; up to r117499
13 files changed:
ChangeLog
configure.ac
etc/NEWS
lisp/ChangeLog
lisp/calendar/diary-lib.el
lisp/mouse.el
lisp/window.el
src/ChangeLog
src/nsterm.m
src/sound.c
src/w32.c
src/window.c
src/xdisp.c