]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
1  2 
src/window.c
src/xdisp.c

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