]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9de87b9 aad3612)
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)
1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history
src/xterm.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge