]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32b1b66 6265325)
merge upstream
authorJoakim Verona <joakim@verona.se>
Sun, 17 Jul 2011 21:57:23 +0000 (23:57 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 17 Jul 2011 21:57:23 +0000 (23:57 +0200)
1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge