Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at
commitf0398ec17f8a00d6c6d828c3d04522d94337d156
authorGlenn Morris <rgm@gnu.org>
Sat, 20 Jul 2013 19:20:33 +0000 (20 12:20 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 20 Jul 2013 19:20:33 +0000 (20 12:20 -0700)
tree478a4829ab66fd14da41090767b8f8a9d8d9122b
parent1451928fffb2065a90e3decd0b9ba34d74dcc22b
parent862f1c9c3a172cd704e286964705b06aaf68b7fa
Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at
INSTALL
lisp/ChangeLog
lisp/image-dired.el
lisp/progmodes/gdb-mi.el
lisp/progmodes/sh-script.el
src/ChangeLog
src/image.c