]> git.eshelyaron.com Git - emacs.git/commitdiff
upstream merge
authorJoakim Verona <joakim@verona.se>
Mon, 5 Oct 2015 15:07:45 +0000 (17:07 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 5 Oct 2015 15:07:45 +0000 (17:07 +0200)
1  2 
src/window.c
src/xdisp.c

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