]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1ae916 f5dacaa)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 10:31:33 +0000 (12:31 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 10:31:33 +0000 (12:31 +0200)
1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge