]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 19:26:49 +0000 (20:26 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 19:26:49 +0000 (20:26 +0100)
1  2 
src/window.c
src/xdisp.c

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