Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
commitcc24ef09f8c050808f9f4989e49122b206e8c934
tree578b29e1c9dd276a965e7b2559f8b09c21df9a83
parent439b1ae89e7c0660ef0a8fa540b12977e38dedf8
parentad8a47b89fc3c5a3302255f318b1ed805838cf72
Merge from trunk.
etc/NEWS
src/emacs.c
src/w32term.c