Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org
authorJuanma Barranquero <lekktu@gmail.com>
Thu, 27 Mar 2014 17:34:22 +0000 (18:34 +0100)
committerJuanma Barranquero <lekktu@gmail.com>
Thu, 27 Mar 2014 17:34:22 +0000 (18:34 +0100)
commit1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381
tree01db12aa0584e566f44f32c062a67f98ea836837
parentb9b37dd04e6f60ef16738efe1b396a9e0a461d86
parent0c4e715c98919593413a76a0ab1458b0d10ea287
Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org
lisp/ChangeLog
lisp/frameset.el
src/ChangeLog
src/w32term.c