]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
commitfda7ba7c422a8d5a5827e33bb1c800778790955f
tree74a7f099ea80bbaca3a6ce7e7d6cddb651c5dc07
parent9de87b9a2f98b8f7b24b3a7b7cb1dfda7c562bf1
parentaad3612f9eb7280bd4db8ee697186e75b1e82765
merge from trunk
src/xdisp.c
src/xterm.c