]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 10:55:50 +0000 (12:55 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 10:55:50 +0000 (12:55 +0200)
1  2 
src/xterm.c

diff --cc src/xterm.c
Simple merge