]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b08632 927eec5)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 13:47:14 +0000 (15:47 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 13:47:14 +0000 (15:47 +0200)
1  2 
src/termhooks.h patch | diff1 | diff2 | blob | history
src/xterm.c patch | diff1 | diff2 | blob | history

diff --cc src/termhooks.h
Simple merge
diff --cc src/xterm.c
Simple merge